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

Commit3f51de3

Browse files
committed
Merge branch '5.1'
* 5.1: [FrameworkBundle] Add Mailjet definition Revert "bug#38063 [FrameworkBundle] generate preload.php in src/ to make opcache.preload predictable (nicolas-grekas)" [PhpUnitBridge] Fix class_alias() for PHPUnit\Framework\Error\Error
2 parents72b94b8 +65ee6c9 commit3f51de3

File tree

8 files changed

+104
-25
lines changed

8 files changed

+104
-25
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespaceSymfony\Bridge\PhpUnit\Tests;
13+
14+
usePHPUnit\Framework\TestCase;
15+
16+
class BootstrapTestextends TestCase
17+
{
18+
/**
19+
* @requires PHPUnit < 6.0
20+
*/
21+
publicfunctiontestAliasingOfErrorClasses()
22+
{
23+
$this->assertInstanceOf(
24+
\PHPUnit_Framework_Error::class,
25+
new \PHPUnit\Framework\Error\Error('message',0,__FILE__,__LINE__)
26+
);
27+
$this->assertInstanceOf(
28+
\PHPUnit_Framework_Error_Deprecated::class,
29+
new \PHPUnit\Framework\Error\Deprecated('message',0,__FILE__,__LINE__)
30+
);
31+
$this->assertInstanceOf(
32+
\PHPUnit_Framework_Error_Notice::class,
33+
new \PHPUnit\Framework\Error\Notice('message',0,__FILE__,__LINE__)
34+
);
35+
$this->assertInstanceOf(
36+
\PHPUnit_Framework_Error_Warning::class,
37+
new \PHPUnit\Framework\Error\Warning('message',0,__FILE__,__LINE__)
38+
);
39+
}
40+
}

‎src/Symfony/Bridge/PhpUnit/bootstrap.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
'PHPUnit_Framework_Constraint_TraversableContains',
5757
'PHPUnit_Framework_Constraint_TraversableContainsOnly',
5858

59-
'PHPUnit_Framework_Error',
6059
'PHPUnit_Framework_Error_Deprecated',
6160
'PHPUnit_Framework_Error_Notice',
6261
'PHPUnit_Framework_Error_Warning',
@@ -100,6 +99,7 @@ class_alias('PHPUnit_Framework_Constraint_And', 'PHPUnit\Framework\Constraint\Lo
10099
class_alias('PHPUnit_Framework_Constraint_Not','PHPUnit\Framework\Constraint\LogicalNot');
101100
class_alias('PHPUnit_Framework_Constraint_Or','PHPUnit\Framework\Constraint\LogicalOr');
102101
class_alias('PHPUnit_Framework_Constraint_Xor','PHPUnit\Framework\Constraint\LogicalXor');
102+
class_alias('PHPUnit_Framework_Error','PHPUnit\Framework\Error\Error');
103103
}
104104

105105
// Detect if we need to serialize deprecations to a file.

‎src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -195,20 +195,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
195195
}
196196
}
197197

198-
$kernelDir =\dirname((new \ReflectionObject($kernel))->getFileName());
199-
$preloadFile =$fs->makePathRelative(\dirname($containerFile,2),$kernelDir);
200-
$preloadFile .=substr_replace(basename($containerFile),'.preload', -4,0);
201-
$preloadFile =var_export('/'.$preloadFile,true);
202-
@file_put_contents($kernelDir.'/.preload.php',<<<EOPHP
203-
<?php
204-
205-
if (file_exists(__DIR__.$preloadFile)) {
206-
require __DIR__.$preloadFile;
207-
}
208-
209-
EOPHP
210-
);
211-
212198
if ($output->isVerbose()) {
213199
$io->comment('Finished');
214200
}

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
useSymfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
8282
useSymfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
8383
useSymfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
84+
useSymfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
8485
useSymfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
8586
useSymfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
8687
useSymfony\Component\Mailer\Bridge\Sendinblue\Transport\SendinblueTransportFactory;
@@ -2124,13 +2125,14 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
21242125
}
21252126

21262127
$classToServices = [
2127-
SesTransportFactory::class =>'mailer.transport_factory.amazon',
21282128
GmailTransportFactory::class =>'mailer.transport_factory.gmail',
2129-
MandrillTransportFactory::class =>'mailer.transport_factory.mailchimp',
21302129
MailgunTransportFactory::class =>'mailer.transport_factory.mailgun',
2130+
MailjetTransportFactory::class =>'mailer.transport_factory.mailjet',
2131+
MandrillTransportFactory::class =>'mailer.transport_factory.mailchimp',
21312132
PostmarkTransportFactory::class =>'mailer.transport_factory.postmark',
21322133
SendgridTransportFactory::class =>'mailer.transport_factory.sendgrid',
21332134
SendinblueTransportFactory::class =>'mailer.transport_factory.sendinblue',
2135+
SesTransportFactory::class =>'mailer.transport_factory.amazon',
21342136
];
21352137

21362138
foreach ($classToServicesas$class =>$service) {

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_transports.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
useSymfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory;
1616
useSymfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory;
1717
useSymfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
18+
useSymfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
1819
useSymfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
1920
useSymfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
2021
useSymfony\Component\Mailer\Bridge\Sendinblue\Transport\SendinblueTransportFactory;
@@ -46,6 +47,10 @@
4647
->parent('mailer.transport_factory.abstract')
4748
->tag('mailer.transport_factory')
4849

50+
->set('mailer.transport_factory.mailjet', MailjetTransportFactory::class)
51+
->parent('mailer.transport_factory.abstract')
52+
->tag('mailer.transport_factory')
53+
4954
->set('mailer.transport_factory.mailgun', MailgunTransportFactory::class)
5055
->parent('mailer.transport_factory.abstract')
5156
->tag('mailer.transport_factory')
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
3+
<containerxmlns="http://symfony.com/schema/dic/services"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
6+
7+
<services>
8+
<serviceid="mailer.transport_factory.abstract"class="Symfony\Component\Mailer\Transport\AbstractTransportFactory"abstract="true">
9+
<argumenttype="service"id="event_dispatcher" />
10+
<argumenttype="service"id="http_client"on-invalid="ignore" />
11+
<argumenttype="service"id="logger"on-invalid="ignore" />
12+
</service>
13+
14+
<serviceid="mailer.transport_factory.amazon"class="Symfony\Component\Mailer\Bridge\Amazon\Transport\SesTransportFactory"parent="mailer.transport_factory.abstract">
15+
<tagname="mailer.transport_factory" />
16+
</service>
17+
18+
<serviceid="mailer.transport_factory.gmail"class="Symfony\Component\Mailer\Bridge\Google\Transport\GmailTransportFactory"parent="mailer.transport_factory.abstract">
19+
<tagname="mailer.transport_factory" />
20+
</service>
21+
22+
<serviceid="mailer.transport_factory.mailchimp"class="Symfony\Component\Mailer\Bridge\Mailchimp\Transport\MandrillTransportFactory"parent="mailer.transport_factory.abstract">
23+
<tagname="mailer.transport_factory" />
24+
</service>
25+
26+
<serviceid="mailer.transport_factory.mailgun"class="Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory"parent="mailer.transport_factory.abstract">
27+
<tagname="mailer.transport_factory" />
28+
</service>
29+
30+
<serviceid="mailer.transport_factory.postmark"class="Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory"parent="mailer.transport_factory.abstract">
31+
<tagname="mailer.transport_factory" />
32+
</service>
33+
34+
<serviceid="mailer.transport_factory.sendgrid"class="Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory"parent="mailer.transport_factory.abstract">
35+
<tagname="mailer.transport_factory" />
36+
</service>
37+
38+
<serviceid="mailer.transport_factory.mailjet"class="Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory"parent="mailer.transport_factory.abstract">
39+
<tagname="mailer.transport_factory" />
40+
</service>
41+
42+
<serviceid="mailer.transport_factory.null"class="Symfony\Component\Mailer\Transport\NullTransportFactory"parent="mailer.transport_factory.abstract">
43+
<tagname="mailer.transport_factory" />
44+
</service>
45+
46+
<serviceid="mailer.transport_factory.sendmail"class="Symfony\Component\Mailer\Transport\SendmailTransportFactory"parent="mailer.transport_factory.abstract">
47+
<tagname="mailer.transport_factory" />
48+
</service>
49+
50+
<serviceid="mailer.transport_factory.smtp"class="Symfony\Component\Mailer\Transport\Smtp\EsmtpTransportFactory"parent="mailer.transport_factory.abstract">
51+
<tagname="mailer.transport_factory"priority="-100" />
52+
</service>
53+
</services>
54+
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ protected function setUp(): void
3838
protectedfunctiontearDown():void
3939
{
4040
$this->fs->remove($this->kernel->getProjectDir());
41-
$this->fs->remove(__DIR__.'/Fixture/.preload.php');
4241
}
4342

4443
publicfunctiontestCacheIsFreshAfterCacheClearedWithWarmup()
@@ -83,7 +82,5 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()
8382
$containerRef =new \ReflectionClass(require$containerFile);
8483
$containerFile =str_replace('tes_'.\DIRECTORY_SEPARATOR,'test'.\DIRECTORY_SEPARATOR,$containerRef->getFileName());
8584
$this->assertMatchesRegularExpression(sprintf('/\'kernel.container_class\'\s*=>\s*\'%s\'/',$containerClass),file_get_contents($containerFile),'kernel.container_class is properly set on the dumped container');
86-
87-
$this->assertFileEquals(__DIR__.'/Fixture/preload.php.expected',__DIR__.'/Fixture/.preload.php');
8885
}
8986
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/preload.php.expected‎

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

0 commit comments

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