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

Commit2c2d4ff

Browse files
committed
Merge branch '2.0' into 2.1
2 parents67bdae4 +98d118b commit2c2d4ff

File tree

14 files changed

+20
-20
lines changed

14 files changed

+20
-20
lines changed

‎contributing/code/bugs.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ If your problem definitely looks like a bug, report it using the official bug
2525
* Describe the steps needed to reproduce the bug with short code examples
2626
(providing a unit test that illustrates the bug is best);
2727

28-
* Give as muchdetails as possible about your environment (OS, PHP version,
28+
* Give as muchdetail as possible about your environment (OS, PHP version,
2929
Symfony version, enabled extensions, ...);
3030

3131
* *(optional)* Attach a:doc:`patch<patches>`.

‎contributing/code/patches.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Get the Symfony2 source code:
7171

7272
* Fork the `Symfony2 repository`_ (click on the "Fork" button);
7373

74-
* After the "hardcoreforking action" has completed, clone your fork locally
74+
* After the "forking action" has completed, clone your fork locally
7575
(this will create a `symfony` directory):
7676

7777
..code-block::bash

‎contributing/code/security.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ This section indexes security vulnerabilities that were fixed in Symfony
5353
releases, starting from Symfony 1.0.0:
5454

5555
* November 29, 2012: `Security release: Symfony 2.0.19 and 2.1.4<http://symfony.com/blog/security-release-symfony-2-0-19-and-2-1-4>`_
56-
* November 25, 2012: `Security release: symfony 1.4.20 released<http://symfony.com/blog/security-release-symfony-1-4-20-released>`_
56+
* November 25, 2012: `Security release: symfony 1.4.20 released<http://symfony.com/blog/security-release-symfony-1-4-20-released>`_ (`CVE-2012-5574<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5574>`_)
5757
* August 28, 2012: `Security Release: Symfony 2.0.17 released<http://symfony.com/blog/security-release-symfony-2-0-17-released>`_
58-
* May 30, 2012: `Security Release: symfony 1.4.18 released<http://symfony.com/blog/security-release-symfony-1-4-18-released>`_
58+
* May 30, 2012: `Security Release: symfony 1.4.18 released<http://symfony.com/blog/security-release-symfony-1-4-18-released>`_ (`CVE-2012-2667<http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-2667>`_)
5959
* February 24, 2012: `Security Release: Symfony 2.0.11 released<http://symfony.com/blog/security-release-symfony-2-0-11-released>`_
6060
* November 16, 2011: `Security Release: Symfony 2.0.6<http://symfony.com/blog/security-release-symfony-2-0-6>`_
6161
* March 21, 2011: `symfony 1.3.10 and 1.4.10: security releases<http://symfony.com/blog/symfony-1-3-10-and-1-4-10-security-releases>`_

‎contributing/code/standards.rst‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ documents.
1515
Since a picture - or some code - is worth a thousand words, here's a short
1616
example containing most features described below:
1717

18-
..code-block::php+html
18+
..code-block::html+php
1919

2020
<?php
2121

@@ -108,12 +108,16 @@ Naming Conventions
108108

109109
* Use namespaces for all classes;
110110

111-
* Abstract classes are often prefixed with ``Abstract``;
111+
* Prefix abstract classes with ``Abstract``. Please note some early Symfony2 classes
112+
do not follow this convention and have not been renamed for backward compatibility
113+
reasons. However all new abstract classes must follow this naming convention;
112114

113115
* Suffix interfaces with ``Interface``;
114116

115117
* Suffix traits with ``Trait``;
116118

119+
* Suffix exceptions with ``Exception``;
120+
117121
* Use alphanumeric characters and underscores for file names;
118122

119123
* Don't forget to look at the more verbose:doc:`conventions` document for

‎contributing/documentation/format.rst‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,6 @@ The current list of supported formats are the following:
108108
+-----------------+-------------+
109109
| html+jinja| Twig|
110110
+-----------------+-------------+
111-
| jinja+html| Twig|
112-
+-----------------+-------------+
113-
| php+html| PHP|
114-
+-----------------+-------------+
115111
| html+php| PHP|
116112
+-----------------+-------------+
117113
| ini| INI|

‎cookbook/configuration/pdo_session_storage.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,22 +136,22 @@ parameter.ini by referencing the database-related parameters defined there:
136136
pdo:
137137
class:PDO
138138
arguments:
139-
-"mysql:dbname=%database_name%"
139+
-"mysql:host=%database_host%;port=%database_port%;dbname=%database_name%"
140140
- %database_user%
141141
- %database_password%
142142
143143
..code-block::xml
144144
145145
<serviceid="pdo"class="PDO">
146-
<argument>mysql:dbname=%database_name%</argument>
146+
<argument>mysql:host=%database_host%;port=%database_port%;dbname=%database_name%</argument>
147147
<argument>%database_user%</argument>
148148
<argument>%database_password%</argument>
149149
</service>
150150
151151
..code-block::php
152152
153153
$pdoDefinition = new Definition('PDO', array(
154-
'mysql:dbname=%database_name%',
154+
'mysql:host=%database_host%;port=%database_port%;dbname=%database_name%',
155155
'%database_user%',
156156
'%database_password%',
157157
));

‎cookbook/doctrine/file_uploads.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ The following controller shows you how to handle the entire process::
176176

177177
When writing the template, don't forget to set the ``enctype`` attribute:
178178

179-
..code-block::html+php
179+
..code-block::html+jinja
180180

181181
<h1>Upload File</h1>
182182

‎images/book/doctrine_image_1.png‎

10.4 KB
Loading

‎images/book/doctrine_image_3.png‎

37.5 KB
Loading

‎images/request-flow.png‎

-2.74 KB
Loading

0 commit comments

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