Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit b2b1239

Browse filesBrowse files
wouterjwouterj
committed
Merge branch '2.7' into 2.8
2 parents a5114d2 + d782c4b commit b2b1239
Copy full SHA for b2b1239

File tree

Expand file treeCollapse file tree

13 files changed

+196
-189
lines changed
Filter options
Expand file treeCollapse file tree

13 files changed

+196
-189
lines changed

‎best_practices/creating-the-project.rst

Copy file name to clipboardExpand all lines: best_practices/creating-the-project.rst
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ to create files and execute the following commands:
3535
c:\> cd projects/
3636
c:\projects\> php symfony new blog
3737
38+
.. note::
39+
40+
If the installer doesn't work for you or doesn't output anything, make sure
41+
that the `Phar extension`_ is installed and enabled on your computer.
42+
3843
This command creates a new directory called ``blog`` that contains a fresh new
3944
project based on the most recent stable Symfony version available. In addition,
4045
the installer checks if your system meets the technical requirements to execute
@@ -178,3 +183,4 @@ the Symfony directory structure.
178183
.. _`Composer download page`: https://getcomposer.org/download/
179184
.. _`public checksums repository`: https://github.com/sensiolabs/checksums
180185
.. _`these steps`: http://fabien.potencier.org/signing-project-releases.html
186+
.. _`Phar extension`: http://php.net/manual/en/intro.phar.php

‎book/controller.rst

Copy file name to clipboardExpand all lines: book/controller.rst
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,10 @@ Controllers are also called *actions*.
116116

117117
This controller is pretty straightforward:
118118

119-
* *line 4*: Symfony takes advantage of PHP's namespace functionality to
120-
namespace the entire controller class. The ``use`` keyword imports the
119+
* *line 2*: Symfony takes advantage of PHP's namespace functionality to
120+
namespace the entire controller class.
121+
122+
* *line 4*: Symfony again takes advantage of PHP's namespace functionality: the ``use`` keyword imports the
121123
``Response`` class, which the controller must return.
122124

123125
* *line 6*: The class name is the concatenation of a name for the controller

‎book/from_flat_php_to_symfony2.rst

Copy file name to clipboardExpand all lines: book/from_flat_php_to_symfony2.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ them for you. Here's the same sample application, now built in Symfony::
554554
{
555555
$posts = $this->get('doctrine')
556556
->getManager()
557-
->createQuery('SELECT p FROM AcmeBlogBundle:Post p')
557+
->createQuery('SELECT p FROM AppBundle:Post p')
558558
->execute();
559559

560560
return $this->render('Blog/list.html.php', array('posts' => $posts));

‎book/includes/_service_container_my_mailer.rst.inc

Copy file name to clipboardExpand all lines: book/includes/_service_container_my_mailer.rst.inc
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
# app/config/services.yml
66
services:
7-
my_mailer:
8-
class: Acme\HelloBundle\Mailer
7+
app.mailer:
8+
class: AppBundle\Mailer
99
arguments: [sendmail]
1010

1111
.. code-block:: xml
@@ -15,10 +15,10 @@
1515
<container xmlns="http://symfony.com/schema/dic/services"
1616
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1717
xsi:schemaLocation="http://symfony.com/schema/dic/services
18-
http://symfony.com/schema/dic/services/services-1.0.xsd"
19-
>
18+
http://symfony.com/schema/dic/services/services-1.0.xsd">
19+
2020
<services>
21-
<service id="my_mailer" class="Acme\HelloBundle\Mailer">
21+
<service id="app.mailer" class="AppBundle\Mailer">
2222
<argument>sendmail</argument>
2323
</service>
2424
</services>
@@ -29,7 +29,7 @@
2929
// app/config/services.php
3030
use Symfony\Component\DependencyInjection\Definition;
3131

32-
$container->setDefinition('my_mailer', new Definition(
33-
'Acme\HelloBundle\Mailer',
32+
$container->setDefinition('app.mailer', new Definition(
33+
'AppBundle\Mailer',
3434
array('sendmail')
3535
));

‎book/installation.rst

Copy file name to clipboardExpand all lines: book/installation.rst
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ to meet those requirements.
8383
distributing them. If you want to verify the integrity of any Symfony
8484
version, follow the steps `explained in this post`_.
8585

86+
.. note::
87+
88+
If the installer doesn't work for you or doesn't output anything, make sure
89+
that the `Phar extension`_ is installed and enabled on your computer.
90+
8691
Basing your Project on a Specific Symfony Version
8792
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8893

@@ -419,3 +424,4 @@ a wide variety of articles about solving specific problems with Symfony.
419424
.. _`Symfony REST Edition`: https://github.com/gimler/symfony-rest-edition
420425
.. _`FOSRestBundle`: https://github.com/FriendsOfSymfony/FOSRestBundle
421426
.. _`Git`: http://git-scm.com/
427+
.. _`Phar extension`: http://php.net/manual/en/intro.phar.php

‎book/page_creation.rst

Copy file name to clipboardExpand all lines: book/page_creation.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ at the end:
191191
192192
.. code-block:: xml
193193
194-
<!-- src/Acme/DemoBundle/Resources/config/routing.xml -->
194+
<!-- app/config/routing.xml -->
195195
<?xml version="1.0" encoding="UTF-8" ?>
196196
<routes xmlns="http://symfony.com/schema/routing"
197197
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -205,7 +205,7 @@ at the end:
205205
206206
.. code-block:: php
207207
208-
// src/Acme/DemoBundle/Resources/config/routing.php
208+
// app/config/routing.php
209209
use Symfony\Component\Routing\RouteCollection;
210210
use Symfony\Component\Routing\Route;
211211

‎book/routing.rst

Copy file name to clipboardExpand all lines: book/routing.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,9 +1186,9 @@ Notice that Symfony adds the string ``Controller`` to the class name (``Blog``
11861186
=> ``BlogController``) and ``Action`` to the method name (``show`` => ``showAction``).
11871187

11881188
You could also refer to this controller using its fully-qualified class name
1189-
and method: ``AppBundle\Controller\BlogController::showAction``.
1190-
But if you follow some simple conventions, the logical name is more concise
1191-
and allows more flexibility.
1189+
and method: ``AppBundle\Controller\BlogController::showAction``. But if you
1190+
follow some simple conventions, the logical name is more concise and allows
1191+
more flexibility.
11921192

11931193
.. note::
11941194

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.