Skip to content

GitLab

Commit 4e1329af authored by catch's avatar catch
Browse files

Revert "Issue #3122112 by longwave, alexpott, jungle, xjm: Update dependencies for Drupal 8.9" 

This reverts commit ea9403e1.
parent e8dfaa7f
Expand all Hide whitespace changes
Inline Side-by-side
composer.json
View file @ 4e1329af
......@@ -32,8 +32,7 @@
"symfony/filesystem": "~3.4.0",
"symfony/finder": "~3.4.0",
"symfony/lock": "~3.4.0",
"symfony/browser-kit": "^3.4.0",
"symfony/dom-crawler": "^3.4.0 !=3.4.38"
"symfony/browser-kit": "^3.4.0"
},
"minimum-stability": "dev",
"prefer-stable": true,
......
composer.lock
View file @ 4e1329af
This diff is collapsed.
composer/Metapackage/CoreRecommended/composer.json
View file @ 4e1329af
......@@ -8,9 +8,9 @@
},
"require": {
"drupal/core": "8.9.x-dev",
"asm89/stack-cors": "1.3.0",
"composer/installers": "v1.9.0",
"composer/semver": "1.5.1",
"asm89/stack-cors": "1.2.0",
"composer/installers": "v1.7.0",
"composer/semver": "1.5.0",
"doctrine/annotations": "v1.4.0",
"doctrine/cache": "v1.6.2",
"doctrine/collections": "v1.4.0",
......@@ -18,50 +18,48 @@
"doctrine/inflector": "v1.2.0",
"doctrine/lexer": "1.0.2",
"easyrdf/easyrdf": "0.9.1",
"egulias/email-validator": "2.1.17",
"guzzlehttp/guzzle": "6.5.3",
"egulias/email-validator": "2.1.11",
"guzzlehttp/guzzle": "6.3.3",
"guzzlehttp/promises": "v1.3.1",
"guzzlehttp/psr7": "1.6.1",
"laminas/laminas-diactoros": "1.8.7p2",
"laminas/laminas-diactoros": "1.8.7",
"laminas/laminas-escaper": "2.6.1",
"laminas/laminas-feed": "2.12.2",
"laminas/laminas-feed": "2.12.0",
"laminas/laminas-stdlib": "3.2.1",
"laminas/laminas-zendframework-bridge": "1.0.3",
"laminas/laminas-zendframework-bridge": "1.0.1",
"masterminds/html5": "2.3.0",
"paragonie/random_compat": "v9.99.99",
"pear/archive_tar": "1.4.9",
"pear/console_getopt": "v1.4.3",
"pear/pear-core-minimal": "v1.10.10",
"pear/pear_exception": "v1.0.1",
"pear/console_getopt": "v1.4.2",
"pear/pear-core-minimal": "v1.10.9",
"pear/pear_exception": "v1.0.0",
"psr/container": "1.0.0",
"psr/http-message": "1.0.1",
"psr/log": "1.1.3",
"psr/log": "1.1.0",
"ralouphie/getallheaders": "3.0.3",
"stack/builder": "v1.0.5",
"symfony-cmf/routing": "1.4.1",
"symfony/class-loader": "v3.4.40",
"symfony/console": "v3.4.40",
"symfony/debug": "v3.4.40",
"symfony/dependency-injection": "v3.4.40",
"symfony/event-dispatcher": "v3.4.40",
"symfony/http-foundation": "v3.4.40",
"symfony/http-kernel": "v3.4.40",
"symfony/polyfill-ctype": "v1.15.0",
"symfony/polyfill-iconv": "v1.15.0",
"symfony/polyfill-intl-idn": "v1.15.0",
"symfony/polyfill-mbstring": "v1.15.0",
"symfony/polyfill-php56": "v1.15.0",
"symfony/polyfill-php70": "v1.15.0",
"symfony/polyfill-php72": "v1.15.0",
"symfony/polyfill-util": "v1.15.0",
"symfony/process": "v3.4.40",
"symfony/class-loader": "v3.4.35",
"symfony/console": "v3.4.35",
"symfony/debug": "v3.4.35",
"symfony/dependency-injection": "v3.4.35",
"symfony/event-dispatcher": "v3.4.35",
"symfony/http-foundation": "v3.4.35",
"symfony/http-kernel": "v3.4.35",
"symfony/polyfill-ctype": "v1.12.0",
"symfony/polyfill-iconv": "v1.12.0",
"symfony/polyfill-mbstring": "v1.12.0",
"symfony/polyfill-php56": "v1.12.0",
"symfony/polyfill-php70": "v1.12.0",
"symfony/polyfill-util": "v1.12.0",
"symfony/process": "v3.4.35",
"symfony/psr-http-message-bridge": "v1.1.2",
"symfony/routing": "v3.4.40",
"symfony/serializer": "v3.4.40",
"symfony/translation": "v3.4.40",
"symfony/validator": "v3.4.40",
"symfony/yaml": "v3.4.40",
"twig/twig": "v1.42.5",
"typo3/phar-stream-wrapper": "v3.1.4"
"symfony/routing": "v3.4.35",
"symfony/serializer": "v3.4.35",
"symfony/translation": "v3.4.35",
"symfony/validator": "v3.4.35",
"symfony/yaml": "v3.4.35",
"twig/twig": "v1.42.3",
"typo3/phar-stream-wrapper": "v3.1.3"
}
}
composer/Metapackage/DevDependencies/composer.json
View file @ 4e1329af
......@@ -21,7 +21,6 @@
"symfony/browser-kit": "^3.4.0",
"symfony/css-selector": "^3.4.0",
"symfony/debug": "^3.4.0",
"symfony/dom-crawler": "^3.4.0 !=3.4.38",
"symfony/filesystem": "~3.4.0",
"symfony/finder": "~3.4.0",
"symfony/lock": "~3.4.0",
......
composer/Metapackage/PinnedDevDependencies/composer.json
View file @ 4e1329af
......@@ -9,28 +9,28 @@
"require": {
"drupal/core": "8.9.x-dev",
"behat/mink": "v1.8.1",
"behat/mink-browserkit-driver": "v1.3.4",
"behat/mink-browserkit-driver": "1.3.3",
"behat/mink-goutte-driver": "v1.2.1",
"behat/mink-selenium2-driver": "v1.4.0",
"composer/ca-bundle": "1.2.7",
"composer/composer": "1.10.5",
"composer/spdx-licenses": "1.5.3",
"composer/xdebug-handler": "1.4.1",
"composer/ca-bundle": "1.2.4",
"composer/composer": "1.9.1",
"composer/spdx-licenses": "1.5.2",
"composer/xdebug-handler": "1.3.3",
"doctrine/instantiator": "1.0.5",
"drupal/coder": "8.3.8",
"fabpot/goutte": "v3.2.3",
"instaclick/php-webdriver": "1.4.7",
"instaclick/php-webdriver": "1.4.6",
"jcalderonzumba/gastonjs": "v1.0.2",
"jcalderonzumba/mink-phantomjs-driver": "v0.3.2",
"justinrainbow/json-schema": "5.2.9",
"justinrainbow/json-schema": "5.2.8",
"mikey179/vfsstream": "v1.6.8",
"myclabs/deep-copy": "1.7.0",
"phar-io/manifest": "1.0.1",
"phar-io/version": "1.0.1",
"phpdocumentor/reflection-common": "1.0.1",
"phpdocumentor/reflection-docblock": "4.3.4",
"phpdocumentor/reflection-docblock": "4.3.2",
"phpdocumentor/type-resolver": "0.5.1",
"phpspec/prophecy": "v1.10.3",
"phpspec/prophecy": "1.9.0",
"phpunit/php-code-coverage": "5.3.2",
"phpunit/php-file-iterator": "1.4.5",
"phpunit/php-text-template": "1.2.1",
......@@ -49,17 +49,17 @@
"sebastian/recursion-context": "3.0.0",
"sebastian/resource-operations": "1.0.0",
"sebastian/version": "2.0.1",
"seld/jsonlint": "1.8.0",
"seld/phar-utils": "1.1.0",
"squizlabs/php_codesniffer": "3.5.5",
"symfony/browser-kit": "v3.4.40",
"symfony/css-selector": "v3.4.40",
"symfony/dom-crawler": "v3.4.40",
"symfony/filesystem": "v3.4.40",
"symfony/finder": "v3.4.40",
"symfony/lock": "v3.4.40",
"symfony/phpunit-bridge": "v3.4.40",
"seld/jsonlint": "1.7.1",
"seld/phar-utils": "1.0.1",
"squizlabs/php_codesniffer": "3.5.4",
"symfony/browser-kit": "v3.4.35",
"symfony/css-selector": "v3.4.35",
"symfony/dom-crawler": "v3.4.35",
"symfony/filesystem": "v3.4.35",
"symfony/finder": "v3.4.35",
"symfony/lock": "v3.4.35",
"symfony/phpunit-bridge": "v3.4.35",
"theseer/tokenizer": "1.1.3",
"webmozart/assert": "1.8.0"
"webmozart/assert": "1.5.0"
}
}
core/modules/migrate/tests/src/Functional/process/DownloadFunctionalTest.php
View file @ 4e1329af
......@@ -73,7 +73,7 @@ public function testExceptionThrow() {
$messages = $id_map_plugin->getMessages(['url' => $invalid_url])->fetchAll();
$this->assertCount(1, $messages);
$message = reset($messages);
$this->assertEquals("Client error: `GET $invalid_url` resulted in a `404 Not Found` response ($invalid_url)", $message->message);
$this->assertEquals("Cannot read from non-readable stream ($invalid_url)", $message->message);
$this->assertEquals(MigrationInterface::MESSAGE_ERROR, $message->level);
// Check that the second row was migrated successfully.
......
core/tests/Drupal/Tests/UiHelperTrait.php
View file @ 4e1329af
......@@ -528,7 +528,7 @@ protected function checkForMetaRefresh() {
if (!empty($refresh) && (!isset($this->maximumMetaRefreshCount) || $this->metaRefreshCount < $this->maximumMetaRefreshCount)) {
// Parse the content attribute of the meta tag for the format:
// "[delay]: URL=[page_to_redirect_to]".
if (preg_match('/\d+;\s*URL=\'?(?<url>[^\']*)/i', $refresh[0]->getAttribute('content'), $match)) {
if (preg_match('/\d+;\s*URL=(?<url>.*)/i', $refresh[0]->getAttribute('content'), $match)) {
$this->metaRefreshCount++;
return $this->drupalGet($this->getAbsoluteUrl(Html::decodeEntities($match['url'])));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment