updated core from 8.4 to 8.5 : bug with login_destination
This commit is contained in:
+1
@@ -3,6 +3,7 @@ label: Update configuration
|
||||
migration_tags:
|
||||
- Drupal 6
|
||||
- Drupal 7
|
||||
- Configuration
|
||||
source:
|
||||
plugin: variable
|
||||
variables:
|
||||
@@ -12,6 +12,8 @@ use Symfony\Component\HttpFoundation\Response;
|
||||
|
||||
/**
|
||||
* Configure update settings for this site.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class UpdateManagerInstall extends FormBase {
|
||||
|
||||
@@ -212,7 +214,7 @@ class UpdateManagerInstall extends FormBase {
|
||||
return;
|
||||
}
|
||||
|
||||
$project_real_location = drupal_realpath($project_location);
|
||||
$project_real_location = \Drupal::service('file_system')->realpath($project_location);
|
||||
$arguments = [
|
||||
'project' => $project,
|
||||
'updater_name' => get_class($updater),
|
||||
|
||||
@@ -11,6 +11,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
|
||||
/**
|
||||
* Configure update settings for this site.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class UpdateManagerUpdate extends FormBase {
|
||||
|
||||
|
||||
@@ -13,6 +13,8 @@ use Symfony\Component\HttpFoundation\Response;
|
||||
|
||||
/**
|
||||
* Configure update settings for this site.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class UpdateReady extends FormBase {
|
||||
|
||||
@@ -136,7 +138,7 @@ class UpdateReady extends FormBase {
|
||||
foreach ($projects as $project => $url) {
|
||||
$project_location = $directory . '/' . $project;
|
||||
$updater = Updater::factory($project_location, $this->root);
|
||||
$project_real_location = drupal_realpath($project_location);
|
||||
$project_real_location = \Drupal::service('file_system')->realpath($project_location);
|
||||
$updates[] = [
|
||||
'project' => $project,
|
||||
'updater_name' => get_class($updater),
|
||||
|
||||
@@ -10,6 +10,8 @@ use Egulias\EmailValidator\EmailValidator;
|
||||
|
||||
/**
|
||||
* Configure update settings for this site.
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
class UpdateSettingsForm extends ConfigFormBase implements ContainerInjectionInterface {
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ package: Testing
|
||||
# version: VERSION
|
||||
# core: 8.x
|
||||
|
||||
# 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: 1520457825
|
||||
|
||||
@@ -5,8 +5,8 @@ package: Testing
|
||||
# version: VERSION
|
||||
# core: 8.x
|
||||
|
||||
# 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: 1520457825
|
||||
|
||||
@@ -5,8 +5,8 @@ package: Testing
|
||||
# version: VERSION
|
||||
# core: 8.x
|
||||
|
||||
# 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: 1520457825
|
||||
|
||||
@@ -5,8 +5,8 @@ package: Testing
|
||||
# version: VERSION
|
||||
# core: 8.x
|
||||
|
||||
# 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: 1520457825
|
||||
|
||||
@@ -5,8 +5,8 @@ package: Testing
|
||||
# version: VERSION
|
||||
# core: 8.x
|
||||
|
||||
# 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: 1520457825
|
||||
|
||||
@@ -38,7 +38,7 @@ class UpdateDeleteFileIfStaleTest extends UpdateTestBase {
|
||||
->set('temporary_maximum_age', -100000)
|
||||
->save();
|
||||
|
||||
$file_path = drupal_realpath($file_name);
|
||||
$file_path = \Drupal::service('file_system')->realpath($file_name);
|
||||
update_delete_file_if_stale($file_path);
|
||||
|
||||
$this->assertFalse(is_file($file_path));
|
||||
|
||||
+3
-3
@@ -4,8 +4,8 @@ description: 'Test theme which acts as a base theme for other test subthemes.'
|
||||
# version: VERSION
|
||||
# core: 8.x
|
||||
|
||||
# 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: 1520457825
|
||||
|
||||
@@ -5,8 +5,8 @@ description: 'Test theme which uses update_test_basetheme as the base theme.'
|
||||
# core: 8.x
|
||||
base theme: update_test_basetheme
|
||||
|
||||
# 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: 1520457825
|
||||
|
||||
@@ -8,8 +8,8 @@ configure: update.settings
|
||||
dependencies:
|
||||
- file
|
||||
|
||||
# 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: 1520457825
|
||||
|
||||
@@ -208,7 +208,7 @@ function update_manager_file_get($url) {
|
||||
$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);
|
||||
return \Drupal::service('file_system')->realpath($url);
|
||||
}
|
||||
|
||||
// Check the cache and download the file if needed.
|
||||
|
||||
Reference in New Issue
Block a user