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

Added annotations example to Linking to Pages examples #5781

Merged
merged 4 commits into from
Nov 5, 2015

Conversation

carlos-granados
Copy link

In the routing examples for the Linking to Pages section there were no annotations examples (which is what most people use). I have added these examples

In the routing examples for the Linking to Pages section there were no annotations examples (which is what most people use). I have added these examples
.. code-block:: php-annotations

// src/AppBundle/Controller/WelcomeController.php
class WelcomeController extends Controller
Copy link
Member

Choose a reason for hiding this comment

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

At the beginning of the annotations snippets we should put the use imports needed to make the code work:

use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;

// ...

Added missing use statements for new annotations code example
@carlos-granados
Copy link
Author

Added the missing use statements

Remove indentation in blank line
@OskarStark
Copy link
Contributor

👍

@xabbuh can you please restart this travis build

@@ -867,6 +867,23 @@ configuration:

.. configuration-block::

.. code-block:: php-annotations

// src/AppBundle/Controller/WelcomeController.php
Copy link
Member

Choose a reason for hiding this comment

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

we will also need the namespace declaration

@xabbuh
Copy link
Member

xabbuh commented Oct 18, 2015

@carlos-granados Thank you for your good job. I just left you some last minor comment and restarted the Travis build (it's green now :)). We also have at least one other routing config example on that page (when talking about hinclude.js). Would you like to update that as well?

@carlos-granados
Copy link
Author

Ok, will look at it tomorrow

added the namespace statements to the annotation examples
@carlos-granados
Copy link
Author

@xabbuh I added the missing namespace statements. In the case of about hinclude.js examples, they are not routing examples, they are config examples, so there is no annotations code that can be added

@xabbuh
Copy link
Member

xabbuh commented Oct 19, 2015

You are right. I have must have confused it. 👍

@weaverryan weaverryan merged commit 43f751e into symfony:2.3 Nov 5, 2015
weaverryan added a commit that referenced this pull request Nov 5, 2015
…arlos-granados)

This PR was merged into the 2.3 branch.

Discussion
----------

Added annotations example to Linking to Pages examples

In the routing examples for the Linking to Pages section there were no annotations examples (which is what most people use). I have added these examples

Commits
-------

43f751e Added missing namespace statements
5941b89 Remove indentation in blank line
05da696 Added missing use statements
30e0dd4 Added annotations example to Linking to Pages examples
weaverryan added a commit that referenced this pull request Nov 5, 2015
@weaverryan
Copy link
Member

Thanks again Carlos! I tweaked the code-blocks at sha: 43e440b. I don't remember if this follows our coding standards or not, but I wanted to focus on the route using as little code as possible.

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.

5 participants