Skip to content

removed deprecated features #2344

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 8 commits into from
Mar 30, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion book/controller.rst
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ the ``notice`` message:

.. code-block:: php

<?php foreach ($view['session']->getFlash('notice') as $message): ?>
<?php foreach ($view['session']->getFlashBag()->get('notice') as $message): ?>
<div class="flash-notice">
<?php echo "<div class='flash-error'>$message</div>" ?>
</div>
Expand Down
14 changes: 0 additions & 14 deletions components/yaml/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,6 @@ string or a file containing YAML. Internally, it calls the
:method:`Symfony\\Component\\Yaml\\Parser::parse` method, but enhances the
error if something goes wrong by adding the filename to the message.

Executing PHP Inside YAML Files
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. versionadded:: 2.1
The ``Yaml::enablePhpParsing()`` method is new to Symfony 2.1. Prior to 2.1,
PHP was *always* executed when calling the ``parse()`` function.

By default, if you include PHP inside a YAML file, it will not be parsed.
If you do want PHP to be parsed, you must call ``Yaml::enablePhpParsing()``
before parsing the file to activate this mode. If you only want to allow
PHP code for a single YAML file, be sure to disable PHP parsing after parsing
the single file by calling ``Yaml::$enablePhpParsing = false;`` (``$enablePhpParsing``
is a public property).

Writing YAML Files
~~~~~~~~~~~~~~~~~~

Expand Down
24 changes: 12 additions & 12 deletions cookbook/configuration/pdo_session_storage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ configuration format of your choice):

<!-- app/config/config.xml -->
<framework:config>
<framework:session handler-id="session.handler.pdo" lifetime="3600" auto-start="true"/>
<framework:session handler-id="session.handler.pdo" session-lifetime="3600" auto-start="true"/>
</framework:config>

<parameters>
Expand Down Expand Up @@ -196,16 +196,16 @@ For MSSQL, the statement might look like the following:
.. code-block:: sql

CREATE TABLE [dbo].[session](
[session_id] [nvarchar](255) NOT NULL,
[session_value] [ntext] NOT NULL,
[session_id] [nvarchar](255) NOT NULL,
[session_value] [ntext] NOT NULL,
[session_time] [int] NOT NULL,
PRIMARY KEY CLUSTERED(
[session_id] ASC
) WITH (
PAD_INDEX = OFF,
STATISTICS_NORECOMPUTE = OFF,
IGNORE_DUP_KEY = OFF,
ALLOW_ROW_LOCKS = ON,
ALLOW_PAGE_LOCKS = ON
) ON [PRIMARY]
PRIMARY KEY CLUSTERED(
[session_id] ASC
) WITH (
PAD_INDEX = OFF,
STATISTICS_NORECOMPUTE = OFF,
IGNORE_DUP_KEY = OFF,
ALLOW_ROW_LOCKS = ON,
ALLOW_PAGE_LOCKS = ON
) ON [PRIMARY]
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
27 changes: 4 additions & 23 deletions cookbook/form/form_customization.rst
Original file line number Diff line number Diff line change
Expand Up @@ -718,13 +718,9 @@ and customize the ``form_errors`` fragment.
{% block form_errors %}
{% spaceless %}
{% if errors|length > 0 %}
<ul class="error_list">
<ul>
{% for error in errors %}
<li>{{
error.messagePluralization is null
? error.messageTemplate|trans(error.messageParameters, 'validators')
: error.messageTemplate|transchoice(error.messagePluralization, error.messageParameters, 'validators')
}}</li>
<li>{{ error.message }}</li>
{% endfor %}
</ul>
{% endif %}
Expand All @@ -735,28 +731,13 @@ and customize the ``form_errors`` fragment.

<!-- form_errors.html.php -->
<?php if ($errors): ?>
<ul class="error_list">
<ul>
<?php foreach ($errors as $error): ?>
<li><?php
if (null === $error->getMessagePluralization()) {
echo $view['translator']->trans(
$error->getMessageTemplate(),
$error->getMessageParameters(),
'validators'
);
} else {
echo $view['translator']->transChoice(
$error->getMessageTemplate(),
$error->getMessagePluralization(),
$error->getMessageParameters(),
'validators'
);
}?></li>
<li><?php echo $error->getMessage() ?></li>
<?php endforeach; ?>
</ul>
<?php endif ?>


.. tip::

See :ref:`cookbook-form-theming-methods` for how to apply this customization.
Expand Down
5 changes: 0 additions & 5 deletions cookbook/validation/custom_constraint.rst
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,6 @@ The validator class is also simple, and only has one required method: ``validate
The first parameter of the ``addViolation`` call is the error message to
use for that violation.

.. versionadded:: 2.1
The ``isValid`` method was renamed to ``validate`` in Symfony 2.1. The
``setMessage`` method was also deprecated, in favor of calling ``addViolation``
on the context.

Using the new Validator
-----------------------

Expand Down
58 changes: 1 addition & 57 deletions reference/configuration/framework.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Configuration
* `secret`_
* `ide`_
* `test`_
* `trust_proxy_headers`_
* `trusted_proxies`_
* `form`_
* enabled
* `csrf_protection`_
Expand Down Expand Up @@ -117,23 +117,6 @@ see :doc:`/components/http_foundation/trusting_proxies`.
'trusted_proxies' => array('192.0.0.1'),
));

trust_proxy_headers
~~~~~~~~~~~~~~~~~~~

.. caution::

The ``trust_proxy_headers`` option is deprecated and will be removed in
Symfony 2.3. See `trusted_proxies`_ and :doc:`/components/http_foundation/trusting_proxies`
for details on how to properly trust proxy data.

**type**: ``Boolean``

Configures if HTTP headers (like ``HTTP_X_FORWARDED_FOR``, ``X_FORWARDED_PROTO``, and
``X_FORWARDED_HOST``) are trusted as an indication for an SSL connection. By default, it is
set to ``false`` and only SSL_HTTPS connections are indicated as secure.

You should enable this setting if your application is behind a reverse proxy.

.. _reference-framework-form:

form
Expand All @@ -148,9 +131,6 @@ session
cookie_lifetime
...............

.. versionadded:: 2.1
This option was formerly known as ``lifetime``

**type**: ``integer`` **default**: ``0``

This determines the lifetime of the session - in seconds. By default it will use
Expand All @@ -159,19 +139,13 @@ This determines the lifetime of the session - in seconds. By default it will use
cookie_path
...........

.. versionadded:: 2.1
This option was formerly known as ``path``

**type**: ``string`` **default**: ``/``

This determines the path to set in the session cookie. By default it will use ``/``.

cookie_domain
.............

.. versionadded:: 2.1
This option was formerly known as ``domain``

**type**: ``string`` **default**: ``''``

This determines the domain to set in the session cookie. By default it's blank,
Expand All @@ -181,19 +155,13 @@ to the cookie specification.
cookie_secure
.............

.. versionadded:: 2.1
This option was formerly known as ``secure``

**type**: ``Boolean`` **default**: ``false``

This determines whether cookies should only be sent over secure connections.

cookie_httponly
...............

.. versionadded:: 2.1
This option was formerly known as ``httponly``

**type**: ``Boolean`` **default**: ``false``

This determines whether cookies should only accesible through the HTTP protocol.
Expand Down Expand Up @@ -377,9 +345,7 @@ Full Default Configuration
.. code-block:: yaml

framework:
charset: ~
secret: ~
trust_proxy_headers: false
trusted_proxies: []
ide: ~
test: ~
Expand Down Expand Up @@ -432,8 +398,6 @@ Full Default Configuration

# session configuration
session:
# DEPRECATED! Session starts on demand
auto_start: false
storage_id: session.storage.native
handler_id: session.handler.native_file
name: ~
Expand All @@ -447,21 +411,6 @@ Full Default Configuration
gc_maxlifetime: ~
save_path: %kernel.cache_dir%/sessions

# DEPRECATED! Please use: cookie_lifetime
lifetime: ~

# DEPRECATED! Please use: cookie_path
path: ~

# DEPRECATED! Please use: cookie_domain
domain: ~

# DEPRECATED! Please use: cookie_secure
secure: ~

# DEPRECATED! Please use: cookie_httponly
httponly: ~

# templating configuration
templating:
assets_version: ~
Expand Down Expand Up @@ -509,9 +458,4 @@ Full Default Configuration
file_cache_dir: %kernel.cache_dir%/annotations
debug: %kernel.debug%


.. versionadded:: 2.1
The ```framework.session.auto_start`` setting has been removed in Symfony2.1,
it will start on demand now.

.. _`protocol-relative`: http://tools.ietf.org/html/rfc3986#section-4.2
4 changes: 0 additions & 4 deletions reference/constraints.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,11 @@ Validation Constraints Reference
constraints/Type

constraints/Email
constraints/MinLength
constraints/MaxLength
constraints/Length
constraints/Url
constraints/Regex
constraints/Ip

constraints/Max
constraints/Min
constraints/Range

constraints/Date
Expand Down
111 changes: 0 additions & 111 deletions reference/constraints/Max.rst

This file was deleted.

Loading