Skip to content
Snippets Groups Projects
Unverified Commit d9e7844f authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3255243 by longwave, kim.pepper, Gábor Hojtsy, andypost: Replace... 

Issue #3255243 by longwave, kim.pepper, Gábor Hojtsy, andypost: Replace Diactoros' PSR-17 implementation with Guzzle's
parent ff2d2ea1
No related branches found
No related tags found
38 merge requests!7471uncessary 5 files are moved from media-library folder to misc folder,!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4289Issue #1344552 by marcingy, Niklas Fiekas, Ravi.J, aleevas, Eduardo Morales...,!4114Issue #2707291: Disable body-level scrolling when a dialog is open as a modal,!3630Issue #2815301 by Chi, DanielVeza, kostyashupenko, smustgrave: Allow to create...,!3291Issue #3336463: Rewrite rules for gzipped CSS and JavaScript aggregates never match,!3143Issue #3313342: [PHP 8.1] Deprecated function: strpos(): Passing null to parameter #1 LayoutBuilderUiCacheContext.php on line 28,!3102Issue #3164428 by DonAtt, longwave, sahil.goyal, Anchal_gupta, alexpott: Use...,!2853#3274419 Makes BaseFieldOverride inherit the internal property from the base field.,!2719Issue #3110137: Remove Classy from core.,!2437Issue #3238257 by hooroomoo, Wim Leers: Fragment link pointing to <textarea>...,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2074Issue #2707689: NodeForm::actions() checks for delete access on new entities,!2062Issue #3246454: Add weekly granularity to views date sort,!1974Issue #3036862 demonstration,!1591Issue #3199697: Add JSON:API Translation experimental module,!1484Exposed filters get values from URL when Ajax is on,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1254Issue #3238915: Refactor (if feasible) uses of the jQuery ready function to use VanillaJS,!1162Issue #3100350: Unable to save '/' root path alias,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!957Added throwing of InvalidPluginDefinitionException from getDefinition().,!925Issue #2339235: Remove taxonomy hard dependency on node module,!877Issue #2708101: Default value for link text is not saved,!873Issue #2875228: Site install not using batch API service,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links,!844Resolve #3036010 "Updaters",!712Issue #2909128: Autocomplete intermittent on Chrome Android,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
Hide whitespace changes
Inline Side-by-side
Showing
with 9 additions and 115 deletions
composer.lock
+ 1
− 101
View file @ d9e7844f
......@@ -452,7 +452,7 @@
"dist": {
"type": "path",
"url": "core",
"reference": "fe303578f231198d09504af69ee768be7c455b06"
"reference": "34bfd0597745e88afb64bf5294f6af4975930fdc"
},
"require": {
"asm89/stack-cors": "^1.1",
......@@ -473,7 +473,6 @@
"ext-tokenizer": "*",
"ext-xml": "*",
"guzzlehttp/guzzle": "^7.3.0",
"laminas/laminas-diactoros": "^2.1",
"laminas/laminas-feed": "^2.12",
"masterminds/html5": "^2.1",
"pear/archive_tar": "^1.4.14",
......@@ -1157,105 +1156,6 @@
],
"time": "2021-10-06T17:43:30+00:00"
},
{
"name": "laminas/laminas-diactoros",
"version": "2.8.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-diactoros.git",
"reference": "0c26ef1d95b6d7e6e3943a243ba3dc0797227199"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/0c26ef1d95b6d7e6e3943a243ba3dc0797227199",
"reference": "0c26ef1d95b6d7e6e3943a243ba3dc0797227199",
"shasum": ""
},
"require": {
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0"
},
"conflict": {
"phpspec/prophecy": "<1.9.0",
"zendframework/zend-diactoros": "*"
},
"provide": {
"psr/http-factory-implementation": "1.0",
"psr/http-message-implementation": "1.0"
},
"require-dev": {
"ext-curl": "*",
"ext-dom": "*",
"ext-gd": "*",
"ext-libxml": "*",
"http-interop/http-factory-tests": "^0.8.0",
"laminas/laminas-coding-standard": "~1.0.0",
"php-http/psr7-integration-tests": "^1.1",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.1",
"psalm/plugin-phpunit": "^0.14.0",
"vimeo/psalm": "^4.3"
},
"type": "library",
"extra": {
"laminas": {
"config-provider": "Laminas\\Diactoros\\ConfigProvider",
"module": "Laminas\\Diactoros"
}
},
"autoload": {
"files": [
"src/functions/create_uploaded_file.php",
"src/functions/marshal_headers_from_sapi.php",
"src/functions/marshal_method_from_sapi.php",
"src/functions/marshal_protocol_version_from_sapi.php",
"src/functions/marshal_uri_from_sapi.php",
"src/functions/normalize_server.php",
"src/functions/normalize_uploaded_files.php",
"src/functions/parse_cookie_header.php",
"src/functions/create_uploaded_file.legacy.php",
"src/functions/marshal_headers_from_sapi.legacy.php",
"src/functions/marshal_method_from_sapi.legacy.php",
"src/functions/marshal_protocol_version_from_sapi.legacy.php",
"src/functions/marshal_uri_from_sapi.legacy.php",
"src/functions/normalize_server.legacy.php",
"src/functions/normalize_uploaded_files.legacy.php",
"src/functions/parse_cookie_header.legacy.php"
],
"psr-4": {
"Laminas\\Diactoros\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"description": "PSR HTTP Message implementations",
"homepage": "https://laminas.dev",
"keywords": [
"http",
"laminas",
"psr",
"psr-17",
"psr-7"
],
"support": {
"chat": "https://laminas.dev/chat",
"docs": "https://docs.laminas.dev/laminas-diactoros/",
"forum": "https://discourse.laminas.dev",
"issues": "https://github.com/laminas/laminas-diactoros/issues",
"rss": "https://github.com/laminas/laminas-diactoros/releases.atom",
"source": "https://github.com/laminas/laminas-diactoros"
},
"funding": [
{
"url": "https://funding.communitybridge.org/projects/laminas-project",
"type": "community_bridge"
}
],
"time": "2021-09-22T03:54:36+00:00"
},
{
"name": "laminas/laminas-escaper",
"version": "2.9.0",
......
composer/Metapackage/CoreRecommended/composer.json
+ 0
− 1
View file @ d9e7844f
......@@ -16,7 +16,6 @@
"guzzlehttp/guzzle": "7.4.0",
"guzzlehttp/promises": "1.5.1",
"guzzlehttp/psr7": "2.1.0",
"laminas/laminas-diactoros": "2.8.0",
"laminas/laminas-escaper": "2.9.0",
"laminas/laminas-feed": "2.15.0",
"laminas/laminas-stdlib": "3.6.1",
......
core/composer.json
+ 0
− 1
View file @ d9e7844f
......@@ -41,7 +41,6 @@
"egulias/email-validator": "^2.1.22|^3.0",
"masterminds/html5": "^2.1",
"symfony/psr-http-message-bridge": "^2.0",
"laminas/laminas-diactoros": "^2.1",
"composer/semver": "^3.0",
"asm89/stack-cors": "^1.1",
"pear/archive_tar": "^1.4.14",
......
core/core.services.yml
+ 4
− 4
View file @ d9e7844f
......@@ -812,16 +812,16 @@ services:
psr7.http_foundation_factory:
class: Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory
psr17.server_request_factory:
class: Laminas\Diactoros\ServerRequestFactory
class: GuzzleHttp\Psr7\HttpFactory
public: false
psr17.stream_factory:
class: Laminas\Diactoros\StreamFactory
class: GuzzleHttp\Psr7\HttpFactory
public: false
psr17.uploaded_file_factory:
class: Laminas\Diactoros\UploadedFileFactory
class: GuzzleHttp\Psr7\HttpFactory
public: false
psr17.response_factory:
class: Laminas\Diactoros\ResponseFactory
class: GuzzleHttp\Psr7\HttpFactory
public: false
psr7.http_message_factory:
class: Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory
......
core/misc/cspell/dictionary.txt
+ 0
− 1
View file @ d9e7844f
......@@ -344,7 +344,6 @@ deutscher
devel
deviantart
dflt
diactoros
dialogcreate
dialogsave
diffchange
......
core/modules/system/tests/modules/router_test_directory/src/TestControllers.php
+ 2
− 2
View file @ d9e7844f
......@@ -8,7 +8,7 @@
use Drupal\Core\Routing\RouteObjectInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Laminas\Diactoros\Response\HtmlResponse;
use GuzzleHttp\Psr7\Response as Psr7Response;
/**
* Controller routines for testing the routing system.
......@@ -93,7 +93,7 @@ public function test21() {
}
public function test23() {
return new HtmlResponse('test23');
return new Psr7Response(200, [], 'test23');
}
public function test24() {
......
core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
+ 2
− 5
View file @ d9e7844f
......@@ -12,10 +12,7 @@
use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Tests\UnitTestCase;
use Laminas\Diactoros\ResponseFactory;
use Laminas\Diactoros\ServerRequestFactory;
use Laminas\Diactoros\StreamFactory;
use Laminas\Diactoros\UploadedFileFactory;
use GuzzleHttp\Psr7\HttpFactory;
use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
......@@ -60,7 +57,7 @@ protected function setUp(): void {
$this->container = new ContainerBuilder();
$class_resolver = new ClassResolver();
$class_resolver->setContainer($this->container);
$this->httpMessageFactory = new PsrHttpFactory(new ServerRequestFactory(), new StreamFactory(), new UploadedFileFactory(), new ResponseFactory());
$this->httpMessageFactory = new PsrHttpFactory(new HttpFactory(), new HttpFactory(), new HttpFactory(), new HttpFactory());
$this->controllerResolver = new ControllerResolver($this->httpMessageFactory, $class_resolver);
}
......
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