8000 [2.7] adds deprecation notices. by hhamon · Pull Request #13060 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[2.7] adds deprecation notices. #13060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jan 5, 2015
Merged

[2.7] adds deprecation notices. #13060

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
86b9f6b
Adds deprecation notices for structures to be removed in 3.0.
Dec 21, 2014
6f57b7b
Reverted trigger_error() function calls on deprecated interfaces to p…
Dec 29, 2014
2a9749d
Fixes deprecation notices.
Dec 29, 2014
39cfd47
Removed deprecation notices from test files.
Dec 29, 2014
fd9c7bb
Normalized @deprecated annotations.
Dec 29, 2014
97efd2c
Fixes more deprecation notices.
Dec 30, 2014
a7f841e
[Form] Adds a way to trigger deprecation notice on demand for Virtual…
Dec 30, 2014
cd9617a
[Validator] adds more deprecation notices.
Dec 30, 2014
e608ba6
[Form] adds more deprecation notices.
Dec 30, 2014
738b9be
[Validator] fixes UuidValidator deprecated class namespace.
Dec 30, 2014
2a3e7d2
Normalizes deprecation notice messages.
Dec 30, 2014
fd47c07
Fixed some deprecations according to @stof feedbacks.
Jan 4, 2015
f9fbb4f
Fixes more deprecation notices as per @stof review.
Jan 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Form] Adds a way to trigger deprecation notice on demand for Virtual… 
…FormAwareIterator class.
  • Loading branch information
Hugo Hamon committed Jan 5, 2015
commit a7f841e8542d9719c8ade0aca876001b6da59f18
6 changes: 6 additions & 0 deletions src/Symfony/Component/Form/Util/InheritDataAwareIterator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,10 @@
*/
class InheritDataAwareIterator extends VirtualFormAwareIterator
{
public function __construct(\Traversable $iterator)
{
// Do not trigger deprecation notice in parent construct method
// when using this class instead of the deprecated parent one.
parent::__construct($iterator, false);
}
}
17 changes: 15 additions & 2 deletions src/Symfony/Component/Form/Util/VirtualFormAwareIterator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

namespace Symfony\Component\Form\Util;

trigger_error('The '.__NAMESPACE__.'\VirtualFormAwareIterator class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\Util\InheritDataAwareIterator class instead.', E_USER_DEPRECATED);

/**
* Iterator that traverses an array of forms.
*
Expand All @@ -27,6 +25,21 @@
*/
class VirtualFormAwareIterator extends \IteratorIterator implements \RecursiveIterator
{
public function __construct(\Traversable $iterator, $triggerDeprecationNotice = true)
{
/**
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be regular command, not a docComment IMO, so it should start with /* only

* Prevent to trigger deprecation notice when already using the
* InheritDataAwareIterator class that extends this deprecated one.
* The {@link Symfony\Component\Form\Util\InheritDataAwareIterator::__construct} method
* forces this argument to false.
*/
if ($triggerDeprecationNotice) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of adding an extra argument, it would be more reliable to use get_class($this) === __CLASS__ given that our use case for avoiding the trigger is for the child class.

trigger_error('The '.__CLASS__.' class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\Util\InheritDataAwareIterator class instead.', E_USER_DEPRECATED);
}

parent::__construct($iterator);
}

/**
* {@inheritdoc}
*/
Expand Down
0