Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbfdf79e

Browse files
Merge branch '4.4'
* 4.4: [MonologBridge] Bump min version for monolog ^1.25 and drop dead code [Bridge/Twig] use tty group on testLintDefaultPaths fix tests mocking final events
2 parents991bf7a +9d472c7 commitbfdf79e

File tree

14 files changed

+35
-206
lines changed

14 files changed

+35
-206
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ install:
289289
fi
290290
291291
echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
292-
tfold src/Symfony/Component/Console.tty $PHPUNITsrc/Symfony/Component/Console--group tty
292+
tfold src/Symfony/Component/Console.tty $PHPUNIT --group tty
293293
if [[ $PHP = ${MIN_PHP%.*} ]]; then
294294
export PHP=$MIN_PHP
295295
tfold src/Symfony/Component/Process.sigchild SYMFONY_DEPRECATIONS_HELPER=weak php-$MIN_PHP/sapi/cli/php ./phpunit --colors=always src/Symfony/Component/Process/

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"doctrine/reflection":"~1.0",
106106
"doctrine/doctrine-bundle":"^1.5|^2.0",
107107
"masterminds/html5":"^2.6",
108-
"monolog/monolog":"^1.11|^2",
108+
"monolog/monolog":"^1.25.1|^2",
109109
"nyholm/psr7":"^1.0",
110110
"ocramius/proxy-manager":"^2.1",
111111
"php-http/httplug":"^1.0|^2.0",

‎src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
useMonolog\Formatter\FormatterInterface;
1515
useMonolog\Formatter\LogstashFormatter;
1616
useMonolog\Handler\AbstractHandler;
17+
useMonolog\Handler\FormattableHandlerTrait;
18+
useMonolog\Handler\ProcessableHandlerTrait;
1719
useMonolog\Logger;
1820
useSymfony\Component\HttpClient\HttpClient;
1921
useSymfony\Contracts\HttpClient\Exception\ExceptionInterface;

‎src/Symfony/Bridge/Monolog/Handler/FormattableHandlerTrait.php‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎src/Symfony/Bridge/Monolog/Handler/ProcessableHandlerTrait.php‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎src/Symfony/Bridge/Monolog/Processor/WebProcessor.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
useMonolog\Processor\WebProcessorasBaseWebProcessor;
1515
useSymfony\Component\EventDispatcher\EventSubscriberInterface;
16-
useSymfony\Component\HttpKernel\Event\ResponseEvent;
16+
useSymfony\Component\HttpKernel\Event\RequestEvent;
1717
useSymfony\Component\HttpKernel\KernelEvents;
1818

1919
/**
@@ -31,7 +31,7 @@ public function __construct(array $extraFields = null)
3131
parent::__construct([],$extraFields);
3232
}
3333

34-
publicfunctiononKernelRequest(ResponseEvent$event)
34+
publicfunctiononKernelRequest(RequestEvent$event)
3535
{
3636
if ($event->isMasterRequest()) {
3737
$this->serverData =$event->getRequest()->server->all();

‎src/Symfony/Bridge/Monolog/Tests/Processor/RouteProcessorTest.php‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
useSymfony\Component\HttpFoundation\Request;
1818
useSymfony\Component\HttpKernel\Event\FinishRequestEvent;
1919
useSymfony\Component\HttpKernel\Event\RequestEvent;
20+
useSymfony\Component\HttpKernel\HttpKernelInterface;
2021

2122
class RouteProcessorTestextends TestCase
2223
{
@@ -28,7 +29,7 @@ public function testProcessor()
2829
{
2930
$request =$this->mockFilledRequest();
3031
$processor =newRouteProcessor();
31-
$processor->addRouteData($this->mockGetResponseEvent($request));
32+
$processor->addRouteData($this->getRequestEvent($request));
3233

3334
$record =$processor(['extra' => []]);
3435

@@ -44,7 +45,7 @@ public function testProcessorWithoutParams()
4445
{
4546
$request =$this->mockFilledRequest();
4647
$processor =newRouteProcessor(false);
47-
$processor->addRouteData($this->mockGetResponseEvent($request));
48+
$processor->addRouteData($this->getRequestEvent($request));
4849

4950
$record =$processor(['extra' => []]);
5051

@@ -63,8 +64,8 @@ public function testProcessorWithSubRequests()
6364
$subRequest =$this->mockFilledRequest($controllerFromSubRequest);
6465

6566
$processor =newRouteProcessor(false);
66-
$processor->addRouteData($this->mockGetResponseEvent($mainRequest));
67-
$processor->addRouteData($this->mockGetResponseEvent($subRequest));
67+
$processor->addRouteData($this->getRequestEvent($mainRequest));
68+
$processor->addRouteData($this->getRequestEvent($subRequest, HttpKernelInterface::SUB_REQUEST));
6869

6970
$record =$processor(['extra' => []]);
7071

@@ -86,9 +87,9 @@ public function testFinishRequestRemovesRelatedEntry()
8687
$subRequest =$this->mockFilledRequest('OtherController::otherMethod');
8788

8889
$processor =newRouteProcessor(false);
89-
$processor->addRouteData($this->mockGetResponseEvent($mainRequest));
90-
$processor->addRouteData($this->mockGetResponseEvent($subRequest));
91-
$processor->removeRouteData($this->mockFinishRequestEvent($subRequest));
90+
$processor->addRouteData($this->getRequestEvent($mainRequest));
91+
$processor->addRouteData($this->getRequestEvent($subRequest, HttpKernelInterface::SUB_REQUEST));
92+
$processor->removeRouteData($this->getFinishRequestEvent($subRequest));
9293
$record =$processor(['extra' => []]);
9394

9495
$this->assertArrayHasKey('requests',$record['extra']);
@@ -98,7 +99,7 @@ public function testFinishRequestRemovesRelatedEntry()
9899
$record['extra']['requests'][0]
99100
);
100101

101-
$processor->removeRouteData($this->mockFinishRequestEvent($mainRequest));
102+
$processor->removeRouteData($this->getFinishRequestEvent($mainRequest));
102103
$record =$processor(['extra' => []]);
103104

104105
$this->assertArrayNotHasKey('requests',$record['extra']);
@@ -108,7 +109,7 @@ public function testProcessorWithEmptyRequest()
108109
{
109110
$request =$this->mockEmptyRequest();
110111
$processor =newRouteProcessor();
111-
$processor->addRouteData($this->mockGetResponseEvent($request));
112+
$processor->addRouteData($this->getRequestEvent($request));
112113

113114
$record =$processor(['extra' => []]);
114115
$this->assertEquals(['extra' => []],$record);
@@ -122,20 +123,14 @@ public function testProcessorDoesNothingWhenNoRequest()
122123
$this->assertEquals(['extra' => []],$record);
123124
}
124125

125-
privatefunctionmockGetResponseEvent(Request$request):RequestEvent
126+
privatefunctiongetRequestEvent(Request$request,int$requestType = HttpKernelInterface::MASTER_REQUEST):RequestEvent
126127
{
127-
$event =$this->getMockBuilder(RequestEvent::class)->disableOriginalConstructor()->getMock();
128-
$event->method('getRequest')->willReturn($request);
129-
130-
return$event;
128+
returnnewRequestEvent($this->createMock(HttpKernelInterface::class),$request,$requestType);
131129
}
132130

133-
privatefunctionmockFinishRequestEvent(Request$request):FinishRequestEvent
131+
privatefunctiongetFinishRequestEvent(Request$request):FinishRequestEvent
134132
{
135-
$event =$this->getMockBuilder(FinishRequestEvent::class)->disableOriginalConstructor()->getMock();
136-
$event->method('getRequest')->willReturn($request);
137-
138-
return$event;
133+
returnnewFinishRequestEvent($this->createMock(HttpKernelInterface::class),$request, HttpKernelInterface::MASTER_REQUEST);
139134
}
140135

141136
privatefunctionmockEmptyRequest():Request

‎src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
usePHPUnit\Framework\TestCase;
1616
useSymfony\Bridge\Monolog\Processor\WebProcessor;
1717
useSymfony\Component\HttpFoundation\Request;
18-
useSymfony\Component\HttpKernel\Event\ResponseEvent;
18+
useSymfony\Component\HttpKernel\Event\RequestEvent;
19+
useSymfony\Component\HttpKernel\HttpKernelInterface;
1920

2021
class WebProcessorTestextends TestCase
2122
{
@@ -71,7 +72,7 @@ public function testCanBeConstructedWithExtraFields()
7172
$this->assertEquals($server['HTTP_REFERER'],$record['extra']['referrer']);
7273
}
7374

74-
privatefunctioncreateRequestEvent($additionalServerParameters = []):array
75+
privatefunctioncreateRequestEvent(array$additionalServerParameters = []):array
7576
{
7677
$server =array_merge(
7778
[
@@ -88,15 +89,7 @@ private function createRequestEvent($additionalServerParameters = []): array
8889
$request->server->replace($server);
8990
$request->headers->replace($server);
9091

91-
$event =$this->getMockBuilder(ResponseEvent::class)
92-
->disableOriginalConstructor()
93-
->getMock();
94-
$event->expects($this->any())
95-
->method('isMasterRequest')
96-
->willReturn(true);
97-
$event->expects($this->any())
98-
->method('getRequest')
99-
->willReturn($request);
92+
$event =newRequestEvent($this->createMock(HttpKernelInterface::class),$request, HttpKernelInterface::MASTER_REQUEST);
10093

10194
return [$event,$server];
10295
}

‎src/Symfony/Bridge/Monolog/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php":"^7.2.9",
20-
"monolog/monolog":"^1.19|^2",
20+
"monolog/monolog":"^1.25.1|^2",
2121
"symfony/service-contracts":"^1.1",
2222
"symfony/http-kernel":"^4.4|^5.0"
2323
},

‎src/Symfony/Bridge/Twig/Tests/Command/LintCommandTest.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ public function testLintFileCompileTimeException()
6666
$this->assertRegExp('/ERROR in \S+ \(line /',trim($tester->getDisplay()));
6767
}
6868

69+
/**
70+
* @group tty
71+
*/
6972
publicfunctiontestLintDefaultPaths()
7073
{
7174
$tester =$this->createCommandTester();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp