Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit936cb0f

Browse files
committed
Merge branch '2.4' into 2.5
* 2.4: Added the schema_filter option to the reference Removing extra whitespace tweaks for the web server configuration chapter [Reference] fix namespace in Expression constraint
2 parentse7a17ff +4c3c726 commit936cb0f

File tree

4 files changed

+29
-9
lines changed

4 files changed

+29
-9
lines changed

‎cookbook/configuration/web_server_configuration.rst

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,28 @@
44
Configuring a Web Server
55
========================
66

7-
The web directory is the home of all of your application's public and static
8-
files. Including images, stylesheets and JavaScript files. It is also where the
9-
front controllers live. For more details, see the:ref:`the-web-directory`.
7+
The preferred way to develop your Symfony2 application is to use
8+
:doc:`PHP's internal web server</cookbook/web_server/built_in>`. However,
9+
when using an older PHP version or when running the application in the production
10+
environment, you'll need to use a fully-featured web server. This article
11+
describes several ways to use Symfony with Apache2 or Nginx.
1012

11-
The web directory services as the document root when configuring your web
12-
server. In the examples below, this directory is in ``/var/www/project/web/``.
13+
When using Apache2, you can configure PHP as an
14+
:ref:`Apache module<web-server-apache-mod-php>` or with FastCGI using
15+
:ref:`PHP FPM<web-server-apache-fpm>`. FastCGI also is the preferred way
16+
to use PHP:ref:`with Nginx<web-server-nginx>`.
17+
18+
..sidebar::The Web Directory
19+
20+
The web directory is the home of all of your application's public and
21+
static files, including images, stylesheets and JavaScript files. It is
22+
also where the front controllers live. For more details, see the:ref:`the-web-directory`.
23+
24+
The web directory services as the document root when configuring your
25+
web server. In the examples below, the ``web/`` directory will be the
26+
document root. This directory is ``/var/www/project/web/``.
27+
28+
.. _web-server-apache-mod-php:
1329

1430
Apache2 with mod_php/PHP-CGI
1531
----------------------------
@@ -63,6 +79,8 @@ following configuration snippet:
6379
Require all granted
6480
</Directory>
6581
82+
.. _web-server-apache-fpm:
83+
6684
Apache2 with PHP-FPM
6785
--------------------
6886

@@ -164,6 +182,8 @@ instead:
164182
165183
FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -socket /var/run/php5-fpm.sock -pass-header Authorization
166184
185+
.. _web-server-nginx:
186+
167187
Nginx
168188
-----
169189

‎reference/configuration/doctrine.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ Full default configuration
2121
some_custom_type:
2222
class:Acme\HelloBundle\MyCustomType
2323
commented:true
24+
# If enabled all tables not prefixed with sf2_ will be ignored by the schema
25+
# tool. This is for custom tables which should not be altered automatically.
26+
#schema_filter: ^sf2_
2427
2528
connections:
2629
default:

‎reference/constraints/Expression.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ One way to accomplish this is with the Expression constraint:
7373
..code-block::php-annotations
7474
7575
// src/Acme/DemoBundle/Model/BlogPost.php
76-
namespace Acme\DemoBundle\Model\BlogPost;
76+
namespace Acme\DemoBundle\Model;
7777
7878
use Symfony\Component\Validator\Constraints as Assert;
7979

‎reference/forms/types/options/attr.rst.inc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,3 @@ as keys. This can be useful when you need to set a custom class for some widget:
1010
$builder->add('body', 'textarea', array(
1111
'attr' => array('class' => 'tinymce'),
1212
));
13-
14-
15-

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp