Skip to content

Fixes for 2.3 branch #4943

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

Merged
merged 3 commits into from
Jan 31, 2015
Merged

Fixes for 2.3 branch #4943

merged 3 commits into from
Jan 31, 2015

Conversation

ifdattic
Copy link
Contributor

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.3
| Fixed tickets |
| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.3
| Fixed tickets |
'tokens' => array(
'a' => 'a6c1e0b6',
'b' => 'f4a7b1f3',
)
Copy link
Member

Choose a reason for hiding this comment

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

missing comma here

Copy link
Member

Choose a reason for hiding this comment

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

We could also use this:

$tokens = array('tokens' => array(
    'a' => 'a6c1e0b6',
    'b' => 'f4a7b1f3',
));

What do you think?

Copy link
Member

Choose a reason for hiding this comment

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

-1 for that proposal
+1 for the comma

I think the key is a bit lost in the proposal and it isn't very clear that it's a tree structure and a and b are childs of tokens.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes sorry, missed that comma, will fix soon.

At first I also did as @xabbuh suggested, but decided against it as it doesn't make it as clear.

Copy link
Member

Choose a reason for hiding this comment

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

Indeed, this is more readable than what I suggested.

@wouterj wouterj merged commit e2769ba into symfony:2.3 Jan 31, 2015
wouterj added a commit that referenced this pull request Jan 31, 2015
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
-------

e2769ba Update sessions.rst
4476646 Fix code example to be more readable
cd1dfa4 Fix typo: These => This
@ifdattic ifdattic deleted the patch-28 branch February 1, 2015 16:06
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.

3 participants