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

Commit715b7d9

Browse files
committed
[Templating] added more deprecation
1 parent224c891 commit715b7d9

File tree

11 files changed

+50
-16
lines changed

11 files changed

+50
-16
lines changed

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
useSymfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder;
3333
useSymfony\Component\Security\Core\User\UserProviderInterface;
3434
useSymfony\Component\Security\Http\Controller\UserValueResolver;
35+
useSymfony\Component\Templating\PhpEngine;
3536

3637
/**
3738
* SecurityExtension.
@@ -97,7 +98,9 @@ public function load(array $configs, ContainerBuilder $container)
9798
$loader->load('security.xml');
9899
$loader->load('security_listeners.xml');
99100
$loader->load('security_rememberme.xml');
100-
$loader->load('templating_php.xml');
101+
if (class_exists(PhpEngine::class)) {
102+
$loader->load('templating_php.xml');
103+
}
101104
$loader->load('templating_twig.xml');
102105
$loader->load('collectors.xml');
103106
$loader->load('guard.xml');

‎src/Symfony/Bundle/SecurityBundle/Resources/config/templating_php.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@
1010
<serviceid="templating.helper.logout_url"class="Symfony\Bundle\SecurityBundle\Templating\Helper\LogoutUrlHelper">
1111
<tagname="templating.helper"alias="logout_url" />
1212
<argumenttype="service"id="security.logout_url_generator" />
13+
14+
<deprecated>The "%service_id%" service is deprecated since Symfony 4.3 and will be removed in 5.0.</deprecated>
1315
</service>
1416

1517
<serviceid="templating.helper.security"class="Symfony\Bundle\SecurityBundle\Templating\Helper\SecurityHelper">
1618
<tagname="templating.helper"alias="security" />
1719
<argumenttype="service"id="security.authorization_checker"on-invalid="ignore" />
20+
21+
<deprecated>The "%service_id%" service is deprecated since Symfony 4.3 and will be removed in 5.0.</deprecated>
1822
</service>
1923
</services>
2024
</container>

‎src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@
1111

1212
namespaceSymfony\Bundle\SecurityBundle\Templating\Helper;
1313

14+
@trigger_error('The'.LogoutUrlHelper::class.' class is deprecated since version 4.3 and will be removed in 5.0; use Twig instead.',E_USER_DEPRECATED);
15+
1416
useSymfony\Component\Security\Http\Logout\LogoutUrlGenerator;
1517
useSymfony\Component\Templating\Helper\Helper;
1618

1719
/**
1820
* LogoutUrlHelper provides generator functions for the logout URL.
1921
*
2022
* @author Jeremy Mikola <jmikola@gmail.com>
23+
*
24+
* @deprecated since version 4.3, to be removed in 5.0; use Twig instead.
2125
*/
2226
class LogoutUrlHelperextends Helper
2327
{

‎src/Symfony/Bundle/SecurityBundle/Templating/Helper/SecurityHelper.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespaceSymfony\Bundle\SecurityBundle\Templating\Helper;
1313

14+
@trigger_error('The'.SecurityHelper::class.' class is deprecated since version 4.3 and will be removed in 5.0; use Twig instead.',E_USER_DEPRECATED);
15+
1416
useSymfony\Component\Security\Acl\Voter\FieldVote;
1517
useSymfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
1618
useSymfony\Component\Templating\Helper\Helper;
@@ -19,6 +21,8 @@
1921
* SecurityHelper provides read-only access to the security checker.
2022
*
2123
* @author Fabien Potencier <fabien@symfony.com>
24+
*
25+
* @deprecated since version 4.3, to be removed in 5.0; use Twig instead.
2226
*/
2327
class SecurityHelperextends Helper
2428
{

‎src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespaceSymfony\Bundle\TwigBundle\Loader;
1313

14+
@trigger_error('The'.FilesystemLoader::class.' class is deprecated since version 4.3 and will be removed in 5.0; use Twig notation for templates instead.',E_USER_DEPRECATED);
15+
1416
useSymfony\Component\Config\FileLocatorInterface;
1517
useSymfony\Component\Templating\TemplateNameParserInterface;
1618
useSymfony\Component\Templating\TemplateReferenceInterface;
@@ -22,6 +24,8 @@
2224
* to work with the Symfony paths and template references.
2325
*
2426
* @author Fabien Potencier <fabien@symfony.com>
27+
*
28+
* @deprecated since version 4.3, to be removed in 5.0; use Twig notation for templates instead.
2529
*/
2630
class FilesystemLoaderextends BaseFilesystemLoader
2731
{

‎src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,9 @@ public function stopwatchExtensionAvailabilityProvider()
280280
];
281281
}
282282

283+
/**
284+
* @group legacy
285+
*/
283286
publicfunctiontestRuntimeLoader()
284287
{
285288
$container =$this->createContainer();

‎src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespaceSymfony\Component\Form\Extension\Templating;
1313

14+
@trigger_error('The'.TemplatingExtension::class.' class is deprecated since version 4.3 and will be removed in 5.0; use Twig instead.',E_USER_DEPRECATED);
15+
1416
useSymfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper;
1517
useSymfony\Component\Form\AbstractExtension;
1618
useSymfony\Component\Form\FormRenderer;
@@ -21,6 +23,8 @@
2123
* Integrates the Templating component with the Form library.
2224
*
2325
* @author Bernhard Schussek <bschussek@gmail.com>
26+
*
27+
* @deprecated since version 4.3, to be removed in 5.0; use Twig instead.
2428
*/
2529
class TemplatingExtensionextends AbstractExtension
2630
{

‎src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@
1111

1212
namespaceSymfony\Component\Form\Extension\Templating;
1313

14+
@trigger_error('The'.TemplatingRendererEngine::class.' class is deprecated since version 4.3 and will be removed in 5.0; use Twig instead.',E_USER_DEPRECATED);
15+
1416
useSymfony\Component\Form\AbstractRendererEngine;
1517
useSymfony\Component\Form\FormView;
1618
useSymfony\Component\Templating\EngineInterface;
1719

1820
/**
1921
* @author Bernhard Schussek <bschussek@gmail.com>
22+
*
23+
* @deprecated since version 4.3, to be removed in 5.0; use Twig instead.
2024
*/
2125
class TemplatingRendererEngineextends AbstractRendererEngine
2226
{

‎src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ public function setTemplating($templating)
5959
thrownew \InvalidArgumentException('The hinclude rendering strategy needs an instance of Twig\Environment or Symfony\Component\Templating\EngineInterface');
6060
}
6161

62+
if ($templatinginstanceof EngineInterface) {
63+
@trigger_error(sprintf('Using a "%s" instance for "%s" is deprecated since version 4.3; use a \Twig\Environment instance instead.', EngineInterface::class,__CLASS__),E_USER_DEPRECATED);
64+
}
65+
6266
$this->templating =$templating;
6367
}
6468

‎src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
useSymfony\Component\HttpKernel\Controller\ControllerReference;
1717
useSymfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer;
1818
useSymfony\Component\HttpKernel\UriSigner;
19+
useTwig\Environment;
20+
useTwig\Loader\ArrayLoader;
1921

2022
class HIncludeFragmentRendererTestextends TestCase
2123
{
@@ -74,29 +76,26 @@ public function testRenderWithAttributesOptions()
7476
$this->assertEquals('<hx:include src="/foo" p1="v1" p2="v2" id="bar">default</hx:include>',$strategy->render('/foo', Request::create('/'), ['default' =>'default','id' =>'bar','attributes' => ['p1' =>'v1','p2' =>'v2']])->getContent());
7577
}
7678

77-
publicfunctiontestRenderWithDefaultText()
79+
publicfunctiontestRenderWithTwigAndDefaultText()
7880
{
79-
$engine =$this->getMockBuilder('Symfony\\Component\\Templating\\EngineInterface')->getMock();
80-
$engine->expects($this->once())
81-
->method('exists')
82-
->with('default')
83-
->willThrowException(new \InvalidArgumentException());
84-
85-
// only default
86-
$strategy =newHIncludeFragmentRenderer($engine);
87-
$this->assertEquals('<hx:include src="/foo">default</hx:include>',$strategy->render('/foo', Request::create('/'), ['default' =>'default'])->getContent());
81+
$twig =newEnvironment($loader =newArrayLoader());
82+
$strategy =newHIncludeFragmentRenderer($twig);
83+
$this->assertEquals('<hx:include src="/foo">loading...</hx:include>',$strategy->render('/foo', Request::create('/'), ['default' =>'loading...'])->getContent());
8884
}
8985

90-
publicfunctiontestRenderWithEngineAndDefaultText()
86+
/**
87+
* @group legacy
88+
*/
89+
publicfunctiontestRenderWithDefaultTextLegacy()
9190
{
9291
$engine =$this->getMockBuilder('Symfony\\Component\\Templating\\EngineInterface')->getMock();
9392
$engine->expects($this->once())
9493
->method('exists')
95-
->with('loading...')
96-
->willThrowException(new \RuntimeException());
94+
->with('default')
95+
->willThrowException(new \InvalidArgumentException());
9796

9897
// only default
9998
$strategy =newHIncludeFragmentRenderer($engine);
100-
$this->assertEquals('<hx:include src="/foo">loading...</hx:include>',$strategy->render('/foo', Request::create('/'), ['default' =>'loading...'])->getContent());
99+
$this->assertEquals('<hx:include src="/foo">default</hx:include>',$strategy->render('/foo', Request::create('/'), ['default' =>'default'])->getContent());
101100
}
102101
}

0 commit comments

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