updated core from 8.4 to 8.5 : bug with login_destination

This commit is contained in:
Bachir Soussi Chiadmi
2018-03-13 14:01:21 +01:00
parent 0d78da249b
commit e668535a4e
3486 changed files with 89604 additions and 33283 deletions
+3 -3
View File
@@ -6,8 +6,8 @@ package: Core
# core: 8.x
configure: entity.contact_form.collection
# Information added by Drupal.org packaging script on 2018-01-03
version: '8.4.4'
# Information added by Drupal.org packaging script on 2018-03-07
version: '8.5.0'
core: '8.x'
project: 'drupal'
datestamp: 1515021228
datestamp: 1520457826
+8
View File
@@ -7,6 +7,7 @@
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\contact\Plugin\rest\resource\ContactMessageResource;
use Drupal\user\Entity\User;
/**
@@ -235,3 +236,10 @@ function contact_form_user_admin_settings_submit($form, FormStateInterface $form
->set('user_default_enabled', $form_state->getValue('contact_default_status'))
->save();
}
/**
* Implements hook_rest_resource_alter().
*/
function contact_rest_resource_alter(&$definitions) {
$definitions['entity:contact_message']['class'] = ContactMessageResource::class;
}
@@ -3,6 +3,7 @@ label: Contact category configuration
migration_tags:
- Drupal 6
- Drupal 7
- Configuration
source:
plugin: contact_category
process:
@@ -2,6 +2,7 @@ id: d6_contact_settings
label: Contact configuration
migration_tags:
- Drupal 6
- Configuration
source:
plugin: contact_settings
variables:
@@ -2,6 +2,7 @@ id: d7_contact_settings
label: Contact configuration
migration_tags:
- Drupal 7
- Configuration
source:
plugin: contact_settings
variables:
@@ -15,6 +15,8 @@ use Drupal\Core\Render\Element\PathElement;
/**
* Base form for contact form edit forms.
*
* @internal
*/
class ContactFormEditForm extends EntityForm implements ContainerInjectionInterface {
use ConfigFormBaseTrait;
+2
View File
@@ -14,6 +14,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Form controller for contact message forms.
*
* @internal
*/
class MessageForm extends ContentEntityForm {
@@ -0,0 +1,25 @@
<?php
namespace Drupal\contact\Plugin\rest\resource;
use Drupal\rest\Plugin\rest\resource\EntityResource;
/**
* Customizes the entity REST Resource plugin for Contact's Message entities.
*
* Message entities are not stored, so they cannot be:
* - retrieved (GET)
* - modified (PATCH)
* - deleted (DELETE)
* Messages can only be sent/created (POST).
*/
class ContactMessageResource extends EntityResource {
/**
* {@inheritdoc}
*/
public function availableMethods() {
return ['POST'];
}
}
@@ -8,8 +8,8 @@ dependencies:
- contact
- user
# Information added by Drupal.org packaging script on 2018-01-03
version: '8.4.4'
# Information added by Drupal.org packaging script on 2018-03-07
version: '8.5.0'
core: '8.x'
project: 'drupal'
datestamp: 1515021228
datestamp: 1520457826
@@ -7,8 +7,8 @@ package: Testing
dependencies:
- contact
# Information added by Drupal.org packaging script on 2018-01-03
version: '8.4.4'
# Information added by Drupal.org packaging script on 2018-03-07
version: '8.5.0'
core: '8.x'
project: 'drupal'
datestamp: 1515021228
datestamp: 1520457826
@@ -9,8 +9,8 @@ dependencies:
- views
- user
# Information added by Drupal.org packaging script on 2018-01-03
version: '8.4.4'
# Information added by Drupal.org packaging script on 2018-03-07
version: '8.5.0'
core: '8.x'
project: 'drupal'
datestamp: 1515021228
datestamp: 1520457826
@@ -367,7 +367,7 @@ class MailHandlerTest extends UnitTestCase {
$recipient->expects($this->once())
->method('getEmail')
->willReturn('user2@drupal.org');
$recipient->expects($this->once())
$recipient->expects($this->any())
->method('getDisplayName')
->willReturn('user2');
$recipient->expects($this->once())