Skip to content
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.

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

Mention @Security() annotation instead of @Secure() #4733

Closed

Conversation

javiereguiluz
Copy link
Member

Q A
Doc fix? no
New docs? yes
Applies to 2.4+
Fixed tickets -

Beware that (if accepted) this PR must be merged in 2.4+ because @Security isn't available in Symfony 2.3.

@xabbuh
Copy link
Member

xabbuh commented Jan 2, 2015

I think we should simply merge this into the 2.5 branch.

By the way, you would have to revert the 2.6 specific changes.

*/
public function editAction($name)
{
// ...
}

.. versionadded:: 2.4
The ``@Security`` annotation was introduced in SensioFrameworkExtraBundle 3.0,
which can only be used with Symfony 2.4 or later.
Copy link
Member

Choose a reason for hiding this comment

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

this is not true technically. Other features of SensioFrameworkExtraBundle 3.0 can be used in Symfony 2.3

Copy link
Member Author

Choose a reason for hiding this comment

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

I copied this note from this other note:

The @Security annotation was introduced in SensioFrameworkExtraBundle 3.0. This bundle 
version can only be used with Symfony 2.4 or later (see the SensioFrameworkExtraBundle 
release cycle).

Source: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html

Should we also fix the original note?

Copy link
Member

Choose a reason for hiding this comment

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

As I said here, we shouldn't over-complicate things here. Even the bundle's readme just states "The minimum version of Symfony2 for this workflow is 2.4.0.".

wouterj and others added 27 commits January 9, 2015 02:04
The `@Security` annotation was introduced in SensioFrameworkExtraBundle
3.0 which requires Symfony 2.4 or higher.

This change has to be reverted in the `2.5` branch once it got merged
up.
| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.5
| Fixed tickets |
| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.5
| Fixed tickets |
| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3
| Fixed tickets |
| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.6
| Fixed tickets |
The class loader is located in the Debug component and not in the
ClassLoader component.
This PR was merged into the 2.5 branch.

Discussion
----------

[Book][Validation] clarify group validation

| Q             | A
| ------------- | ---
| Doc fix?      | no
| New docs?     | no
| Applies to    | 2.5+
| Fixed tickets | part of symfony#4094

This is for item `F` of symfony#4094. Actually, we didn't have anything wrong as long as I didn't miss anything. I only made two little changes to fix a sentence and clarify the legacy API.

Commits
-------

1c79cad clarify group validation
This PR was merged into the 2.6 branch.

Discussion
----------

Update templating.rst

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.6
| Fixed tickets |

Commits
-------

851be38 Update templating.rst
This PR was merged into the 2.6 branch.

Discussion
----------

Fix markup

versionadded directives are quite strange, as it doesn't allow to have empty lines in it. So both code blocks were rendered as a blockquote (using shortcut) and PHP code for the main text (using code-block directive). This fixes it and also fixes some other markup errors.

Commits
-------

ab66a12 Fix markup
This PR was merged into the 2.3 branch.

Discussion
----------

[Cookbook][Routing] Fixed typo

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3+
| Fixed tickets |

Commits
-------

0a60deb [Cookbook][Routing] Fixed typo
Displaying the message of an `AuthenticationException` might expose
sensitive data to the user.
wouterj and others added 17 commits February 1, 2015 15:45
Conflicts:
	changelog.rst
Conflicts:
	changelog.rst
…book (javiereguiluz)

This PR was merged into the 2.3 branch.

Discussion
----------

Removed the Stable API chapter from the Symfony book

| Q             | A
| ------------- | ---
| Doc fix?      | no
| New docs?     | no
| Applies to    | all
| Fixed tickets | -

The two main reasons for this change are: 1) the traffic to that book chapter is almost zero; 2) all the things explained in this "chapter" are better explained in the BC Promise article. A redirection to that article has been setup.

Commits
-------

42269d4 Removed the Stable API chapter from the Symfony book
… in PHP templates (javiereguiluz)

This PR was merged into the 2.3 branch.

Discussion
----------

Added a reference about including JS and CSS files in PHP templates

| Q             | A
| ------------- | ---
| Doc fix?      | no
| New docs?     | yes
| Applies to    | all
| Fixed tickets | symfony#4836

Commits
-------

5c6d4b2 Fixed a minor RST syntax issue
4d472c2 Added a reference about including JS and CSS files in PHP templates
| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.4
| Fixed tickets |
This PR was submitted for the 2.4 branch but it was merged into the 2.5 branch instead (closes symfony#4928).

Discussion
----------

Change installation method order

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.4
| Fixed tickets |

Commits
-------

1db39c2 Update introduction.rst
475be21 Change installation method order
* 2.3:
  [symfony#4928] Backporting change after merging into 2.5 (since 2.3 is a little different)
  Fixed a minor RST syntax issue
  Added a reference about including JS and CSS files in PHP templates
  Removed the Stable API chapter from the Symfony book

Conflicts:
	book/stable_api.rst
	components/debug/introduction.rst
…ractices (ifdattic)

This PR was merged into the 2.3 branch.

Discussion
----------

Remove block which doesn't make sense after best practices

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3
| Fixed tickets |

Commits
-------

26415e2 Remove block which doesn't make sense after best practices
This PR was merged into the 2.6 branch.

Discussion
----------

Fixes for 2.6 branch

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.6
| Fixed tickets |

Commits
-------

9ad21ea Fix typos
6e023c1 Fix typos
This PR was merged into the 2.3 branch.

Discussion
----------

Fixes for 2.3 branch

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3
| Fixed tickets |

Commits
-------

e6ffd5d Add missing comma in array
da70836 Fix typos
* 2.3:
  Add missing comma in array
  Fix typos
  Remove block which doesn't make sense after best practices
* 2.5:
  [symfony#4928] Backporting change after merging into 2.5 (since 2.3 is a little different)
  Update introduction.rst
  Change installation method order
  Add missing comma in array
  Fix typos
  Remove block which doesn't make sense after best practices
  Fixed a minor RST syntax issue
  Added a reference about including JS and CSS files in PHP templates
  Removed the Stable API chapter from the Symfony book
@javiereguiluz
Copy link
Member Author

@xabbuh is there anything else left to be done in this PR before consider it finished? Thanks.

@xabbuh
Copy link
Member

xabbuh commented Feb 2, 2015

@javiereguiluz Given that 2.5 has reached the end of maintenance in the meantime, I think you can put back the 2.6 related changes. So this can then be merged into the 2.6 branch directly.

@javiereguiluz
Copy link
Member Author

@xabbuh I've done what you said, so this PR is ready for the final review. Thanks.

@xabbuh
Copy link
Member

xabbuh commented Feb 2, 2015

👍

@wouterj
Copy link
Member

wouterj commented Feb 3, 2015

@javiereguiluz could you please rebase this PR against 2.6? GH has lots of trouble with our submodules when switching form an unmaintained branch (2.4) to a maintained one.

@javiereguiluz javiereguiluz force-pushed the mention_security_annotation branch from 17ee9e8 to 6e273b8 Compare February 3, 2015 13:57
@javiereguiluz javiereguiluz force-pushed the mention_security_annotation branch from 6e273b8 to 99163ed Compare February 3, 2015 14:03
@javiereguiluz javiereguiluz deleted the mention_security_annotation branch February 3, 2015 14:03
@javiereguiluz
Copy link
Member Author

Closed this pull request in favor of #4957

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.