8000 minor #12968 Deprecations (jzawadzki, dkvk, nicolas-grekas, picur, mr… · symfony/symfony@13fae15 · GitHub
[go: up one dir, main page]
Skip to content

Commit 13fae15

Browse files
fabpotfabpot
committed
minor #12968 Deprecations (jzawadzki, dkvk, nicolas-grekas, picur, mrcmorales)
This PR was merged into the 2.7 branch. Discussion ---------- Deprecations | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #12625, #12605, #12628, #12622, #12642, #12609, #12651, #12604, #12607, #12667, #12648 | License | MIT | Doc PR | - Cherry-picking some pending PRs to make them move forward Commits ------- badf8fc [Form] Log deprecation of constants, fixes #12607 #12667 1d58df4 Fix deprecation notice on VirtualFormAwareIterator e2a19ee Add a deprecation note about VirtualFormAwareIterator ab4d9b8 Add a deprecation note about CsrfProviderInterface cb70632 [HttpKernel] fix deprecation notice for Kernel::init() b5a315d [HttpKernel] Added deprecated error to init() 70012c1 [Hackday] [2.7] Add a deprecation note about TypeTestCase
2 parents eaf07db + badf8fc commit 13fae15

File tree

16 files changed

+91
-20
lines changed

16 files changed

+91
-20
lines changed

‎src/Symfony/Bridge/Propel1/Tests/Form/Type/TranslationCollectionTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Bridge\Propel1\Form\PropelExtension;
1616
use Symfony\Bridge\Propel1\Tests\Fixtures\TranslatableItemI18n;
1717
use Symfony\Bridge\Propel1\Tests\Fixtures\TranslatableItem;
18-
use Symfony\Component\Form\Tests\Extension\Core\Type\TypeTestCase;
18+
use Symfony\Component\Form\Test\TypeTestCase;
1919

2020
class TranslationCollectionTypeTest extends TypeTestCase
2121
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ public function registerBundles()
7474
return include $filename;
7575
}
7676

77-
public function init()
78-
{
79-
}
80-
8177
public function getR 6D40 ootDir()
8278
{
8379
return __DIR__;

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ public function registerBundles()
7474
return include $filename;
7575
}
7676

77-
public function init()
78-
{
79-
}
80-
8177
public function getRootDir()
8278
{
8379
return __DIR__;

‎src/Symfony/Component/Form/Deprecated/FormEvents.php

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
/*
3+
* This file is part of the Symfony package.
4+
*
5+
* (c) Fabien Potencier <fabien@symfony.com>
6+
*
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
9+
*/
10+
11+
namespace Symfony\Component\Form\Deprecated;
12+
13+
trigger_error('Constants PRE_BIND, BIND and POST_BIND on class Symfony\Component\Form\FormEvents were deprecated in Symfony 2.3 and will be removed in 3.0. Use PRE_SUBMIT, SUBMIT and POST_SUBMIT instead.', E_USER_DEPRECATED);
14+
15+
/**
16+
* @deprecated since 2.7, to be removed in 3.0.
17+
* @internal
18+
*/
19+
final class FormEvents
20+
{
21+
const PRE_BIND = 'form.pre_bind';
22+
const BIND = 'form.bind';
23+
const POST_BIND = 'form.post_bind';
24+
25+
private function __construct()
26+
{
27+
}
28+
}

‎src/Symfony/Component/Form/Deprecated/NumberToLocalizedStringTransformer.php

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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+
namespace Symfony\Component\Form\Deprecated;
13+
14+
trigger_error('Constants ROUND_HALFEVEN, ROUND_HALFUP and ROUND_HALFDOWN on class NumberToLocalizedStringTransformer were deprecated in Symfony 2.4 and will be removed in 3.0. Use ROUND_HALF_EVEN, ROUND_HALF_UP and ROUND_HALF_DOWN instead.', E_USER_DEPRECATED);
15+
16+
/**
17+
* @deprecated since 2.7, to be removed in 3.0.
18+
* @internal
19+
*/
20+
final class NumberToLocalizedStringTransformer
21+
{
22+
const ROUND_HALFEVEN = \NumberFormatter::ROUND_HALFEVEN;
23+
const ROUND_HALFUP = \NumberFormatter::ROUND_HALFUP;
24+
const ROUND_HALFDOWN = \NumberFormatter::ROUND_HALFDOWN;
25+
26+
private function __construct()
27+
{
28+
}
29+
}

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

Lines changed: 4 additions & 3 deletions
10000
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Component\Form\DataTransformerInterface;
1515
use Symfony\Component\Form\Exception\TransformationFailedException;
16+
use Symfony\Component\Form\Deprecated\NumberToLocalizedStringTransformer as Deprecated;
1617

1718
/**
1819
* Transforms between a number type and a localized number with grouping
@@ -77,21 +78,21 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface
7778
*
7879
* @deprecated Deprecated as of Symfony 2.4, to be removed in Symfony 3.0.
7980
*/
80-
const ROUND_HALFEVEN = self::ROUND_HALF_EVEN;
81+
const ROUND_HALFEVEN = Deprecated::ROUND_HALFEVEN;
8182

8283
/**
8384
* Alias for {@link self::ROUND_HALF_UP}.
8485
*
8586
* @deprecated Deprecated as of Symfony 2.4, to be removed in Symfony 3.0.
8687
*/
87-
const ROUND_HALFUP = self::ROUND_HALF_UP;
88+
const ROUND_HALFUP = Deprecated::ROUND_HALFUP;
8889

8990
/**
9091
* Alias for {@link self::ROUND_HALF_DOWN}.
9192
*
9293
* @deprecated Deprecated as of Symfony 2.4, to be removed in Symfony 3.0.
9394
*/
94-
const ROUND_HALFDOWN = self::ROUND_HALF_DOWN;
95+
const ROUND_HALFDOWN = Deprecated::ROUND_HALFDOWN;
9596

9697
protected $precision;
9798

‎src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php

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

1212
namespace Symfony\Component\Form\Extension\Csrf\CsrfProvider;
1313

14+
trigger_error('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderAdapter was deprecated in version 2.4 and will be removed in version 3.0. Please use Symfony\Component\Security\Csrf\CsrfTokenManager instead.', E_USER_DEPRECATED);
15+
1416
use Symfony\Component\Form\Exception\BadMethodCallException;
1517
use Symfony\Component\Security\Csrf\CsrfToken;
1618
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;

‎src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfProviderInterface.php

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

1212
namespace Symfony\Component\Form\Extension\Csrf\CsrfProvider;
1313

14+
trigger_error('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface was deprecated in version 2.4 and will be removed in version 3.0. Please use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface instead.', E_USER_DEPRECATED);
15+
1416
/**
1517
* Marks classes able to provide CSRF protection
1618
*

‎src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php

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

1212
namespace Symfony\Component\Form\Extension\Csrf\CsrfProvider;
1313

14+
trigger_error('Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfTokenManagerAdapter was deprecated in version 2.4 and will be removed in version 3.0. Please use Symfony\Component\Security\Csrf\CsrfTokenManager instead.', E_USER_DEPRECATED);
15+
1416
use Symfony\Component\Security\Csrf\CsrfToken;
1517
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
1618

‎src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/DefaultCsrfProvider.php

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

1212
namespace Symfony\Component\Form\Extension\Csrf\CsrfProvider;
1313

14+
trigger_error('Symfony\Component\Security\Csrf\CsrfTokenManager was deprecated in version 2.4 and will be removed in version 3.0. Please use \Symfony\Component\Security\Csrf\TokenStorage\NativeSessionTokenStorage instead.', E_USER_DEPRECATED);
15+
1416
/**
1517
* Default implementation of CsrfProviderInterface.
1618
*

‎src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/SessionCsrfProvider.php

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

1212
namespace Symfony\Component\Form\Extension\Csrf\CsrfProvider;
1313

14+
trigger_error('Symfony\Component\Security\Csrf\CsrfTokenManager was deprecated in version 2.4 and will be removed in version 3.0. Please use Symfony\Component\Security\Csrf\TokenStorage\SessionTokenStorage instead.', E_USER_DEPRECATED);
15+
1416
use Symfony\Component\HttpFoundation\Session\Session;
1517

1618
/**

‎src/Symfony/Component/Form/FormEvents.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
namespace Symfony\Component\Form;
1212

13+
use Symfony\Component\Form\Deprecated\FormEvents as Deprecated;
14+
1315
/**
1416
* @author Bernhard Schussek <bschussek@gmail.com>
1517
*/
@@ -77,23 +79,23 @@ final class FormEvents
7779
*
7880
* @Event
7981
*/
80-
const PRE_BIND = 'form.pre_bind';
82+
const PRE_BIND = Deprecated::PRE_BIND;
8183

8284
/**
8385
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
8486
* {@link SUBMIT} instead.
8587
*
8688
* @Event
8789
*/
88-
const BIND = 'form.bind';
90+
const BIND = Deprecated::BIND;
8991

9092
/**
9193
* @deprecated Deprecated since version 2.3, to be removed in 3.0. Use
9294
* {@link POST_SUBMIT} instead.
9395
*
9496
* @Event
9597
*/
96-
const POST_BIND = 'form.post_bind';
98+
const POST_BIND = Deprecated::POST_BIND;
9799

98100
private function __construct()
99101
{

‎src/Symfony/Component/Form/Tests/Extension/Core/Type/TypeTestCase.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,9 @@
1818
*/
1919
abstract class TypeTestCase extends BaseTypeTestCase
2020
{
21+
protected function setUp()
22+
{
23+
trigger_error('Abstract class "Symfony\Component\Form\Tests\Extension\Core\Type\TypeTestCase" is deprecated since version 2.3 and will be removed in 3.0. Use "Symfony\Component\Form\Test\TypeTestCase" instead.', E_USER_DEPRECATED);
24+
parent::setUp();
25+
}
2126
}

‎src/Symfony/Component/Form/Util/VirtualFormAwareIterator.php

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

1212
namespace Symfony\Component\Form\Util;
1313

14+
trigger_error('Symfony\Component\Form\Util\VirtualFormAwareIterator is deprecated since Symfony 2.3 and will be removed in 3.0. Use Symfony\Component\Form\Util\InheritDataAwareIterator instead.', E_USER_DEPRECATED);
15+
1416
/**
1517
* Iterator that traverses an array of forms.
1618
*

‎src/Symfony/Component/HttpKernel/Kernel.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,13 @@ public function __construct($environment, $debug)
8585
$this->startTime = microtime(true);
8686
}
8787

88-
$this->init();
88+
$defClass = new \ReflectionMethod($this, 'init');
89+
$defClass = $defClass->getDeclaringClass()->name;
90+
91+
if (__CLASS__ !== $defClass) {
92+
trigger_error(sprintf('Calling %s::init() was deprecated in Symfony 2.3 and will be removed in 3. AAEC 0. Move your logic to the constructor instead.', $defClass), E_USER_DEPRECATED);
93+
$this->init();
94+
}
8995
}
9096

9197
/**

‎src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ public function registerBundles()
6969
{
7070
}
7171

72-
public function init()
73-
{
74-
}
75-
7672
public function getBundles()
7773
{
7874
return array();

0 commit comments

Comments
 (0)
0