From 2bfd4a7699de284db95d73f313fa2b69cdffa0ae Mon Sep 17 00:00:00 2001
From: "lee.5151" <lee.5151@osu.edu>
Date: Tue, 29 Nov 2022 12:05:08 -0500
Subject: [PATCH] Upgrading drupal/rebuild_cache_access (1.7.0 => 1.8.0)
---
composer.json | 2 +-
composer.lock | 42 ++++++++---------
vendor/composer/installed.json | 46 +++++++++----------
vendor/composer/installed.php | 22 ++++-----
.../Compiler/DecoratorServicePass.php | 2 +-
.../Compiler/ServiceLocatorTagPass.php | 4 ++
.../Factory/PsrHttpFactory.php | 2 +-
.../rebuild_cache_access.info.yml | 9 ++--
8 files changed, 66 insertions(+), 63 deletions(-)
diff --git a/composer.json b/composer.json
index a79cf4cb0c..60023d0c9f 100644
--- a/composer.json
+++ b/composer.json
@@ -150,7 +150,7 @@
"drupal/pathauto": "1.11",
"drupal/queue_mail": "^1.4",
"drupal/realname": "^2.0@beta",
- "drupal/rebuild_cache_access": "1.7",
+ "drupal/rebuild_cache_access": "1.8",
"drupal/recaptcha": "3.1",
"drupal/recaptcha_v3": "^1.4",
"drupal/redirect": "1.6",
diff --git a/composer.lock b/composer.lock
index af6ea30619..fa26e41f97 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "00b3339b124e176f69a985ebf27eaa8c",
+ "content-hash": "a92902d45eed95ee6eb80cc34aff66e2",
"packages": [
{
"name": "alchemy/zippy",
@@ -6480,26 +6480,26 @@
},
{
"name": "drupal/rebuild_cache_access",
- "version": "1.7.0",
+ "version": "1.8.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/rebuild_cache_access.git",
- "reference": "8.x-1.7"
+ "reference": "8.x-1.8"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/rebuild_cache_access-8.x-1.7.zip",
- "reference": "8.x-1.7",
- "shasum": "96bba176bce2bfc8b691ea77ec19d78dcab34032"
+ "url": "https://ftp.drupal.org/files/projects/rebuild_cache_access-8.x-1.8.zip",
+ "reference": "8.x-1.8",
+ "shasum": "afe57559cd5fbd939211eee63351b3a47f6819a8"
},
"require": {
- "drupal/core": "^8 || ^9"
+ "drupal/core": "^8 || ^9 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.7",
- "datestamp": "1640716552",
+ "version": "8.x-1.8",
+ "datestamp": "1658665206",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -13181,16 +13181,16 @@
},
{
"name": "symfony/dependency-injection",
- "version": "v4.4.44",
+ "version": "v4.4.49",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "25502a57182ba1e15da0afd64c975cae4d0a1471"
+ "reference": "9065fe97dbd38a897e95ea254eb5ddfe1310f734"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/25502a57182ba1e15da0afd64c975cae4d0a1471",
- "reference": "25502a57182ba1e15da0afd64c975cae4d0a1471",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9065fe97dbd38a897e95ea254eb5ddfe1310f734",
+ "reference": "9065fe97dbd38a897e95ea254eb5ddfe1310f734",
"shasum": ""
},
"require": {
@@ -13247,7 +13247,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dependency-injection/tree/v4.4.44"
+ "source": "https://github.com/symfony/dependency-injection/tree/v4.4.49"
},
"funding": [
{
@@ -13263,7 +13263,7 @@
"type": "tidelift"
}
],
- "time": "2022-07-20T09:59:04+00:00"
+ "time": "2022-11-16T16:18:09+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -15041,16 +15041,16 @@
},
{
"name": "symfony/psr-http-message-bridge",
- "version": "v2.1.3",
+ "version": "v2.1.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/psr-http-message-bridge.git",
- "reference": "d444f85dddf65c7e57c58d8e5b3a4dbb593b1840"
+ "reference": "a125b93ef378c492e274f217874906fb9babdebb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/d444f85dddf65c7e57c58d8e5b3a4dbb593b1840",
- "reference": "d444f85dddf65c7e57c58d8e5b3a4dbb593b1840",
+ "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/a125b93ef378c492e274f217874906fb9babdebb",
+ "reference": "a125b93ef378c492e274f217874906fb9babdebb",
"shasum": ""
},
"require": {
@@ -15109,7 +15109,7 @@
],
"support": {
"issues": "https://github.com/symfony/psr-http-message-bridge/issues",
- "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.3"
+ "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.4"
},
"funding": [
{
@@ -15125,7 +15125,7 @@
"type": "tidelift"
}
],
- "time": "2022-09-05T10:34:54+00:00"
+ "time": "2022-11-28T22:46:34+00:00"
},
{
"name": "symfony/routing",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index f5e3806242..b24ac0dabe 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -6710,27 +6710,27 @@
},
{
"name": "drupal/rebuild_cache_access",
- "version": "1.7.0",
- "version_normalized": "1.7.0.0",
+ "version": "1.8.0",
+ "version_normalized": "1.8.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/rebuild_cache_access.git",
- "reference": "8.x-1.7"
+ "reference": "8.x-1.8"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/rebuild_cache_access-8.x-1.7.zip",
- "reference": "8.x-1.7",
- "shasum": "96bba176bce2bfc8b691ea77ec19d78dcab34032"
+ "url": "https://ftp.drupal.org/files/projects/rebuild_cache_access-8.x-1.8.zip",
+ "reference": "8.x-1.8",
+ "shasum": "afe57559cd5fbd939211eee63351b3a47f6819a8"
},
"require": {
- "drupal/core": "^8 || ^9"
+ "drupal/core": "^8 || ^9 || ^10"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.7",
- "datestamp": "1591970433",
+ "version": "8.x-1.8",
+ "datestamp": "1658665206",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -13698,17 +13698,17 @@
},
{
"name": "symfony/dependency-injection",
- "version": "v4.4.44",
- "version_normalized": "4.4.44.0",
+ "version": "v4.4.49",
+ "version_normalized": "4.4.49.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "25502a57182ba1e15da0afd64c975cae4d0a1471"
+ "reference": "9065fe97dbd38a897e95ea254eb5ddfe1310f734"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/25502a57182ba1e15da0afd64c975cae4d0a1471",
- "reference": "25502a57182ba1e15da0afd64c975cae4d0a1471",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9065fe97dbd38a897e95ea254eb5ddfe1310f734",
+ "reference": "9065fe97dbd38a897e95ea254eb5ddfe1310f734",
"shasum": ""
},
"require": {
@@ -13739,7 +13739,7 @@
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
"symfony/yaml": ""
},
- "time": "2022-07-20T09:59:04+00:00",
+ "time": "2022-11-16T16:18:09+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -13767,7 +13767,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dependency-injection/tree/v4.4.44"
+ "source": "https://github.com/symfony/dependency-injection/tree/v4.4.49"
},
"funding": [
{
@@ -15627,17 +15627,17 @@
},
{
"name": "symfony/psr-http-message-bridge",
- "version": "v2.1.3",
- "version_normalized": "2.1.3.0",
+ "version": "v2.1.4",
+ "version_normalized": "2.1.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/psr-http-message-bridge.git",
- "reference": "d444f85dddf65c7e57c58d8e5b3a4dbb593b1840"
+ "reference": "a125b93ef378c492e274f217874906fb9babdebb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/d444f85dddf65c7e57c58d8e5b3a4dbb593b1840",
- "reference": "d444f85dddf65c7e57c58d8e5b3a4dbb593b1840",
+ "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/a125b93ef378c492e274f217874906fb9babdebb",
+ "reference": "a125b93ef378c492e274f217874906fb9babdebb",
"shasum": ""
},
"require": {
@@ -15658,7 +15658,7 @@
"suggest": {
"nyholm/psr7": "For a super lightweight PSR-7/17 implementation"
},
- "time": "2022-09-05T10:34:54+00:00",
+ "time": "2022-11-28T22:46:34+00:00",
"type": "symfony-bridge",
"extra": {
"branch-alias": {
@@ -15698,7 +15698,7 @@
],
"support": {
"issues": "https://github.com/symfony/psr-http-message-bridge/issues",
- "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.3"
+ "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.4"
},
"funding": [
{
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 1299061afa..66422095aa 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'osu-asc-webservices/d8-upstream',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => 'ba6af3568d179c683bcb49150597c4f6eb32e14e',
+ 'reference' => '7b38d41b8b6ae95e9b0320d434f2220a4367f2d9',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -1100,9 +1100,9 @@
'dev_requirement' => false,
),
'drupal/rebuild_cache_access' => array(
- 'pretty_version' => '1.7.0',
- 'version' => '1.7.0.0',
- 'reference' => '8.x-1.7',
+ 'pretty_version' => '1.8.0',
+ 'version' => '1.8.0.0',
+ 'reference' => '8.x-1.8',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/rebuild_cache_access',
'aliases' => array(),
@@ -1594,7 +1594,7 @@
'osu-asc-webservices/d8-upstream' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => 'ba6af3568d179c683bcb49150597c4f6eb32e14e',
+ 'reference' => '7b38d41b8b6ae95e9b0320d434f2220a4367f2d9',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -2190,9 +2190,9 @@
'dev_requirement' => false,
),
'symfony/dependency-injection' => array(
- 'pretty_version' => 'v4.4.44',
- 'version' => '4.4.44.0',
- 'reference' => '25502a57182ba1e15da0afd64c975cae4d0a1471',
+ 'pretty_version' => 'v4.4.49',
+ 'version' => '4.4.49.0',
+ 'reference' => '9065fe97dbd38a897e95ea254eb5ddfe1310f734',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/dependency-injection',
'aliases' => array(),
@@ -2403,9 +2403,9 @@
'dev_requirement' => false,
),
'symfony/psr-http-message-bridge' => array(
- 'pretty_version' => 'v2.1.3',
- 'version' => '2.1.3.0',
- 'reference' => 'd444f85dddf65c7e57c58d8e5b3a4dbb593b1840',
+ 'pretty_version' => 'v2.1.4',
+ 'version' => '2.1.4.0',
+ 'reference' => 'a125b93ef378c492e274f217874906fb9babdebb',
'type' => 'symfony-bridge',
'install_path' => __DIR__ . '/../symfony/psr-http-message-bridge',
'aliases' => array(),
diff --git a/vendor/symfony/dependency-injection/Compiler/DecoratorServicePass.php b/vendor/symfony/dependency-injection/Compiler/DecoratorServicePass.php
index 3b8086d093..185a097ebe 100644
--- a/vendor/symfony/dependency-injection/Compiler/DecoratorServicePass.php
+++ b/vendor/symfony/dependency-injection/Compiler/DecoratorServicePass.php
@@ -42,7 +42,7 @@ public function process(ContainerBuilder $container)
$tagsToKeep = $container->hasParameter('container.behavior_describing_tags')
? $container->getParameter('container.behavior_describing_tags')
- : ['container.do_not_inline', 'container.service_locator', 'container.service_subscriber'];
+ : ['container.do_not_inline', 'container.service_locator', 'container.service_subscriber', 'container.service_subscriber.locator'];
foreach ($definitions as [$id, $definition]) {
$decoratedService = $definition->getDecoratedService();
diff --git a/vendor/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php b/vendor/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php
index 5fdbe5686d..72b093043b 100644
--- a/vendor/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php
+++ b/vendor/symfony/dependency-injection/Compiler/ServiceLocatorTagPass.php
@@ -39,6 +39,10 @@ protected function processValue($value, $isRoot = false)
return self::register($this->container, $value->getValues());
}
+ if ($value instanceof Definition) {
+ $value->setBindings(parent::processValue($value->getBindings()));
+ }
+
if (!$value instanceof Definition || !$value->hasTag('container.service_locator')) {
return parent::processValue($value, $isRoot);
}
diff --git a/vendor/symfony/psr-http-message-bridge/Factory/PsrHttpFactory.php b/vendor/symfony/psr-http-message-bridge/Factory/PsrHttpFactory.php
index 61650df9f6..b1b6f9ae26 100644
--- a/vendor/symfony/psr-http-message-bridge/Factory/PsrHttpFactory.php
+++ b/vendor/symfony/psr-http-message-bridge/Factory/PsrHttpFactory.php
@@ -142,7 +142,7 @@ public function createResponse(Response $symfonyResponse)
$stream->write($buffer);
return '';
- });
+ }, 1);
$symfonyResponse->sendContent();
ob_end_clean();
diff --git a/web/modules/rebuild_cache_access/rebuild_cache_access.info.yml b/web/modules/rebuild_cache_access/rebuild_cache_access.info.yml
index edb31a3dc4..449f2bc03e 100644
--- a/web/modules/rebuild_cache_access/rebuild_cache_access.info.yml
+++ b/web/modules/rebuild_cache_access/rebuild_cache_access.info.yml
@@ -3,12 +3,11 @@ description: Provide a Rebuild Cache admin toolbar button accessible to every ro
package: Utility
type: module
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8 || ^9 || ^10
dependencies:
- drupal:toolbar
-# Information added by Drupal.org packaging script on 2020-06-12
-version: '8.x-1.7'
+# Information added by Drupal.org packaging script on 2022-07-24
+version: '8.x-1.8'
project: 'rebuild_cache_access'
-datestamp: 1591970435
+datestamp: 1658665208
--
GitLab