From 3fa8e4ce5275365f2c8b1aef7dbae905d652ba21 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Fri, 31 Jul 2015 20:06:05 +0200 Subject: [PATCH 1/2] Remove 2.x versionaddeds from 3.0 docs --- book/forms.rst | 23 ------------ book/templating.rst | 4 -- book/testing.rst | 5 --- book/validation.rst | 5 --- components/console/events.rst | 3 -- components/console/helpers/dialoghelper.rst | 3 -- components/console/helpers/progresshelper.rst | 3 -- components/console/helpers/tablehelper.rst | 3 -- components/console/introduction.rst | 4 -- components/debug/introduction.rst | 4 -- .../dependency_injection/lazy_services.rst | 3 -- components/dom_crawler.rst | 5 --- components/event_dispatcher/introduction.rst | 4 -- components/filesystem/introduction.rst | 3 -- components/finder.rst | 4 -- components/form/form_events.rst | 5 --- components/form/introduction.rst | 7 ---- .../http_foundation/trusting_proxies.rst | 4 -- components/intl.rst | 4 -- components/process.rst | 13 ------- components/property_access/introduction.rst | 7 ---- components/serializer.rst | 29 --------------- components/var_dumper/introduction.rst | 4 -- cookbook/console/logging.rst | 3 -- cookbook/console/sending_emails.rst | 4 -- cookbook/doctrine/mapping_model_classes.rst | 7 ---- cookbook/email/email.rst | 5 --- cookbook/form/create_custom_field_type.rst | 4 -- cookbook/form/direct_submit.rst | 10 ----- cookbook/form/dynamic_form_modification.rst | 4 -- cookbook/form/inherit_data_option.rst | 4 -- cookbook/form/unit_testing.rst | 5 --- .../request/load_balancer_reverse_proxy.rst | 3 -- cookbook/serializer.rst | 15 -------- cookbook/session/php_bridge.rst | 3 -- reference/configuration/framework.rst | 37 ------------------- reference/configuration/security.rst | 4 -- reference/constraints/Collection.rst | 4 -- reference/constraints/Currency.rst | 3 -- reference/constraints/EqualTo.rst | 3 -- reference/constraints/GreaterThan.rst | 3 -- reference/constraints/GreaterThanOrEqual.rst | 3 -- reference/constraints/Iban.rst | 3 -- reference/constraints/IdenticalTo.rst | 3 -- reference/constraints/Isbn.rst | 3 -- reference/constraints/Issn.rst | 3 -- reference/constraints/LessThan.rst | 3 -- reference/constraints/LessThanOrEqual.rst | 3 -- reference/constraints/NotEqualTo.rst | 3 -- reference/constraints/NotIdenticalTo.rst | 3 -- reference/constraints/Url.rst | 3 -- reference/dic_tags.rst | 3 -- reference/forms/twig_reference.rst | 3 -- reference/forms/types/button.rst | 3 -- reference/forms/types/entity.rst | 4 -- reference/forms/types/money.rst | 4 -- reference/forms/types/options/action.rst.inc | 3 -- .../forms/types/options/inherit_data.rst.inc | 4 -- reference/forms/types/options/method.rst.inc | 3 -- .../forms/types/options/placeholder.rst.inc | 4 -- reference/forms/types/options/scale.rst.inc | 4 -- reference/forms/types/percent.rst | 4 -- reference/forms/types/reset.rst | 3 -- reference/forms/types/submit.rst | 3 -- 64 files changed, 345 deletions(-) diff --git a/book/forms.rst b/book/forms.rst index 51d6d349257..1d35dc878ff 100644 --- a/book/forms.rst +++ b/book/forms.rst @@ -122,10 +122,6 @@ other things, determines which HTML form tag(s) is rendered for that field. Finally, you added a submit button with a custom label for submitting the form to the server. -.. versionadded:: 2.3 - Support for submit buttons was introduced in Symfony 2.3. Before that, you had - to add buttons to the form's HTML manually. - Symfony comes with many built-in types that will be discussed shortly (see :ref:`book-forms-type-reference`). @@ -240,12 +236,6 @@ controller:: // ... } -.. versionadded:: 2.3 - The :method:`Symfony\\Component\\Form\\FormInterface::handleRequest` method - was introduced in Symfony 2.3. Previously, the ``$request`` was passed - to the ``submit`` method - a strategy which is deprecated and will be - removed in Symfony 3.0. For details on that method, see :ref:`cookbook-form-submit-request`. - This controller follows a common pattern for handling forms, and has three possible paths: @@ -294,9 +284,6 @@ possible paths: Submitting Forms with Multiple Buttons ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. versionadded:: 2.3 - Support for buttons in forms was introduced in Symfony 2.3. - When your form contains more than one submit button, you will want to check which of the buttons was clicked to adapt the program flow in your controller. To do this, add a second button with the caption "Save and add" to your form:: @@ -470,10 +457,6 @@ you'll need to specify which validation group(s) your form should use:: 'validation_groups' => array('registration'), ))->add(...); -.. versionadded:: 2.7 - The ``configureOptions()`` method was introduced in Symfony 2.7. Previously, - the method was called ``setDefaultOptions()``. - If you're creating :ref:`form classes ` (a good practice), then you'll need to add the following to the ``configureOptions()`` method:: @@ -496,9 +479,6 @@ be used to validate the underlying object. Disabling Validation ~~~~~~~~~~~~~~~~~~~~ -.. versionadded:: 2.3 - The ability to set ``validation_groups`` to false was introduced in Symfony 2.3. - Sometimes it is useful to suppress the validation of a form altogether. For these cases you can set the ``validation_groups`` option to ``false``:: @@ -599,9 +579,6 @@ work in the book section about :ref:`validation groups text(); }); -.. versionadded:: 2.3 - As seen here, in Symfony 2.3, the ``each`` and ``reduce`` Closure functions - are passed a ``Crawler`` as the first argument. Previously, that argument - was a :phpclass:`DOMNode`. - The anonymous function receives the node (as a Crawler) and the position as arguments. The result is an array of values returned by the anonymous function calls. diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst index 23bb2ab3193..5e3a66cd25d 100644 --- a/components/event_dispatcher/introduction.rst +++ b/components/event_dispatcher/introduction.rst @@ -628,10 +628,6 @@ and so on... Event Name Introspection ~~~~~~~~~~~~~~~~~~~~~~~~ -.. versionadded:: 2.4 - Before Symfony 2.4, the event name and the event dispatcher had to be - requested from the ``Event`` instance. These methods are now deprecated. - The ``EventDispatcher`` instance, as well as the name of the event that is dispatched, are passed as arguments to the listener:: diff --git a/components/filesystem/introduction.rst b/components/filesystem/introduction.rst index 7e872390df5..b96fd965378 100644 --- a/components/filesystem/introduction.rst +++ b/components/filesystem/introduction.rst @@ -239,9 +239,6 @@ isAbsolutePath dumpFile ~~~~~~~~ -.. versionadded:: 2.3 - The ``dumpFile()`` was introduced in Symfony 2.3. - :method:`Symfony\\Component\\Filesystem\\Filesystem::dumpFile` allows you to dump contents to a file. It does this in an atomic manner: it writes a temporary file first and then moves it to the new file location when it's finished. diff --git a/components/finder.rst b/components/finder.rst index 09babd0809c..5ed93aa7015 100644 --- a/components/finder.rst +++ b/components/finder.rst @@ -95,10 +95,6 @@ Exclude directories from matching with the $finder->in(__DIR__)->exclude('ruby'); -.. versionadded:: 2.3 - The :method:`Symfony\\Component\\Finder\\Finder::ignoreUnreadableDirs` - method was introduced in Symfony 2.3. - It's also possible to ignore directories that you don't have permission to read:: $finder->ignoreUnreadableDirs()->in(__DIR__); diff --git a/components/form/form_events.rst b/components/form/form_events.rst index 5fb51d59fa1..005a99d9a35 100644 --- a/components/form/form_events.rst +++ b/components/form/form_events.rst @@ -264,11 +264,6 @@ Name ``FormEvents`` Constant Event's Data ``form.post_bind`` ``FormEvents::POST_SUBMIT`` View data ====================== ============================= =============== -.. versionadded:: 2.3 - Before Symfony 2.3, ``FormEvents::PRE_SUBMIT``, ``FormEvents::SUBMIT`` - and ``FormEvents::POST_SUBMIT`` were called ``FormEvents::PRE_BIND``, - ``FormEvents::BIND`` and ``FormEvents::POST_BIND``. - .. caution:: The ``FormEvents::PRE_BIND``, ``FormEvents::BIND`` and diff --git a/components/form/introduction.rst b/components/form/introduction.rst index 91dce8944c4..663931d93e5 100644 --- a/components/form/introduction.rst +++ b/components/form/introduction.rst @@ -68,9 +68,6 @@ factory. Request Handling ~~~~~~~~~~~~~~~~ -.. versionadded:: 2.3 - The ``handleRequest()`` method was introduced in Symfony 2.3. - To process form data, you'll need to call the :method:`Symfony\\Component\\Form\\Form::handleRequest` method:: @@ -500,10 +497,6 @@ to do that in the ":ref:`form-rendering-template`" section. Changing a Form's Method and Action ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. versionadded:: 2.3 - The ability to configure the form method and action was introduced in - Symfony 2.3. - By default, a form is submitted to the same URI that rendered the form with an HTTP POST request. This behavior can be changed using the :ref:`form-option-action` and :ref:`form-option-method` options (the ``method`` option is also used diff --git a/components/http_foundation/trusting_proxies.rst b/components/http_foundation/trusting_proxies.rst index fbe9b30cdee..a8c0193668d 100644 --- a/components/http_foundation/trusting_proxies.rst +++ b/components/http_foundation/trusting_proxies.rst @@ -19,10 +19,6 @@ Since HTTP headers can be spoofed, Symfony does *not* trust these proxy headers by default. If you are behind a proxy, you should manually whitelist your proxy. -.. versionadded:: 2.3 - CIDR notation support was introduced in Symfony 2.3, so you can whitelist whole - subnets (e.g. ``10.0.0.0/8``, ``fc00::/7``). - .. code-block:: php use Symfony\Component\HttpFoundation\Request; diff --git a/components/intl.rst b/components/intl.rst index af85a06aabb..084e5b2d519 100644 --- a/components/intl.rst +++ b/components/intl.rst @@ -8,10 +8,6 @@ The Intl Component A PHP replacement layer for the C `intl extension`_ that also provides access to the localization data of the `ICU library`_. -.. versionadded:: 2.3 - The Intl component was introduced in Symfony 2.3. In earlier versions of Symfony, - you should use the Locale component instead. - .. caution:: The replacement layer is limited to the locale "en". If you want to use diff --git a/components/process.rst b/components/process.rst index 0958ed94f77..811cf8897c5 100644 --- a/components/process.rst +++ b/components/process.rst @@ -130,9 +130,6 @@ are done doing other stuff:: Stopping a Process ------------------ -.. versionadded:: 2.3 - The ``signal`` parameter of the ``stop`` method was introduced in Symfony 2.3. - Any asynchronous process can be stopped at any time with the :method:`Symfony\\Component\\Process\\Process::stop` method. This method takes two arguments: a timeout and a signal. Once the timeout is reached, the signal @@ -169,10 +166,6 @@ To make your code work better on all platforms, you might want to use the $builder = new ProcessBuilder(array('ls', '-lsa')); $builder->getProcess()->run(); -.. versionadded:: 2.3 - The :method:`ProcessBuilder::setPrefix` - method was introduced in Symfony 2.3. - In case you are building a binary driver, you can use the :method:`Symfony\\Component\\Process\\Process::setPrefix` method to prefix all the generated process commands. @@ -248,9 +241,6 @@ exceeds 3600 seconds, or the process does not produce any output for 60 seconds. Process Signals --------------- -.. versionadded:: 2.3 - The ``signal`` method was introduced in Symfony 2.3. - When running a program asynchronously, you can send it POSIX signals with the :method:`Symfony\\Component\\Process\\Process::signal` method:: @@ -274,9 +264,6 @@ When running a program asynchronously, you can send it POSIX signals with the Process Pid ----------- -.. versionadded:: 2.3 - The ``getPid`` method was introduced in Symfony 2.3. - You can access the `pid`_ of a running process with the :method:`Symfony\\Component\\Process\\Process::getPid` method. diff --git a/components/property_access/introduction.rst b/components/property_access/introduction.rst index d678cbb2509..8711bf3f2ce 100644 --- a/components/property_access/introduction.rst +++ b/components/property_access/introduction.rst @@ -31,10 +31,6 @@ default configuration:: $accessor = PropertyAccess::createPropertyAccessor(); -.. versionadded:: 2.3 - The :method:`Symfony\\Component\\PropertyAccess\\PropertyAccess::createPropertyAccessor` - method was introduced in Symfony 2.3. Previously, it was called ``getPropertyAccessor()``. - Reading from Arrays ------------------- @@ -215,9 +211,6 @@ enable this feature by using :class:`Symfony\\Component\\PropertyAccess\\Propert var_dump($accessor->getValue($person, 'wouter')); // array(...) -.. versionadded:: 2.3 - The use of magic ``__call()`` method was introduced in Symfony 2.3. - .. caution:: The ``__call`` feature is disabled by default, you can enable it by calling diff --git a/components/serializer.rst b/components/serializer.rst index 14512852b91..a304fba9a66 100644 --- a/components/serializer.rst +++ b/components/serializer.rst @@ -178,10 +178,6 @@ This is a common need when working with an ORM. Attributes Groups ----------------- -.. versionadded:: 2.7 - The support of serialization and deserialization groups was introduced - in Symfony 2.7. - Sometimes, you want to serialize different sets of attributes from your entities. Groups are a handy way to achieve this need. @@ -320,14 +316,6 @@ Ignoring Attributes Using attribute groups instead of the :method:`Symfony\\Component\\Serializer\\Normalizer\\AbstractNormalizer::setIgnoredAttributes` method is considered best practice. -.. versionadded:: 2.3 - The :method:`Symfony\\Component\\Serializer\\Normalizer\\AbstractNormalizer::setIgnoredAttributes` - method was introduced in Symfony 2.3. - -.. versionadded:: 2.7 - Prior to Symfony 2.7, attributes were only ignored while serializing. Since Symfony - 2.7, they are ignored when deserializing too. - As an option, there's a way to ignore attributes from the origin object. To remove those attributes use the :method:`Symfony\\Component\\Serializer\\Normalizer\\AbstractNormalizer::setIgnoredAttributes` @@ -347,10 +335,6 @@ method on the normalizer definition:: Converting Property Names when Serializing and Deserializing ------------------------------------------------------------ -.. versionadded:: 2.7 - The :class:`Symfony\\Component\\Serializer\\NameConverter\\NameConverterInterface` - interface was introduced in Symfony 2.7. - Sometimes serialized attributes must be named differently than properties or getter/setter methods of PHP classes. @@ -416,10 +400,6 @@ and :class:`Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer`:: CamelCase to snake_case ~~~~~~~~~~~~~~~~~~~~~~~ -.. versionadded:: 2.7 - The :class:`Symfony\\Component\\Serializer\\NameConverter\\CamelCaseToSnakeCaseNameConverter` - interface was introduced in Symfony 2.7. - In many formats, it's common to use underscores to separate words (also known as snake_case). However, PSR-1 specifies that the preferred style for PHP properties and methods is CamelCase. @@ -533,10 +513,6 @@ There are several types of normalizers available: The :class:`Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer` class was introduced in Symfony 2.6. -.. versionadded:: 2.7 - The :class:`Symfony\\Component\\Serializer\\Normalizer\\ObjectNormalizer` - class was introduced in Symfony 2.7. - Handling Circular References ---------------------------- @@ -655,11 +631,6 @@ Serializing arrays works just like serializing a single object:: // $data contains [{"name":"foo","age":99,"sportsman":false},{"name":"bar","age":33,"sportsman":true}] -.. versionadded:: 2.8 - The :class:`Symfony\\Component\\Serializer\\Normalizer\\ArrayDenormalizer` - class was introduced in 2.8. Prior to Symfony 2.8, only the serialization of - arrays is supported. - If you want to deserialize such a structure, you need to add the :class:`Symfony\\Component\\Serializer\\Normalizer\\ArrayDenormalizer` to the set of normalizers. By appending ``[]`` to the type parameter of the diff --git a/components/var_dumper/introduction.rst b/components/var_dumper/introduction.rst index 2f125192763..1312da9ebe8 100644 --- a/components/var_dumper/introduction.rst +++ b/components/var_dumper/introduction.rst @@ -125,10 +125,6 @@ original value. You can configure the limits in terms of: Using the VarDumper Component in your PHPUnit Test Suite -------------------------------------------------------- -.. versionadded:: 2.7 - The :class:`Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait` was - introduced in Symfony 2.7. - The VarDumper component provides :class:`a trait ` that can help writing some of your tests for PHPUnit. diff --git a/cookbook/console/logging.rst b/cookbook/console/logging.rst index 08781d7901b..e79e0c0676f 100644 --- a/cookbook/console/logging.rst +++ b/cookbook/console/logging.rst @@ -73,9 +73,6 @@ Enabling automatic Exceptions Logging To get your console application to automatically log uncaught exceptions for all of your commands, you can use :doc:`console events`. -.. versionadded:: 2.3 - Console events were introduced in Symfony 2.3. - First configure a listener for console exception events in the service container: .. configuration-block:: diff --git a/cookbook/console/sending_emails.rst b/cookbook/console/sending_emails.rst index 5f9669d3428..300ced4fd9b 100644 --- a/cookbook/console/sending_emails.rst +++ b/cookbook/console/sending_emails.rst @@ -85,10 +85,6 @@ from the ``router`` service and override its settings:: Using Memory Spooling --------------------- -.. versionadded:: 2.3 - When using Symfony 2.3+ and SwiftmailerBundle 2.3.5+, the memory spool is now - handled automatically in the CLI and the code below is not necessary anymore. - Sending emails in a console command works the same way as described in the :doc:`/cookbook/email/email` cookbook except if memory spooling is used. diff --git a/cookbook/doctrine/mapping_model_classes.rst b/cookbook/doctrine/mapping_model_classes.rst index acace8725f2..26783a02d55 100644 --- a/cookbook/doctrine/mapping_model_classes.rst +++ b/cookbook/doctrine/mapping_model_classes.rst @@ -16,13 +16,6 @@ register the mappings for your model classes. for one of the ODMs. For reusable bundles, rather than duplicate model classes just to get the auto-mapping, use the compiler pass. -.. versionadded:: 2.3 - The base mapping compiler pass was introduced in Symfony 2.3. The Doctrine bundles - support it from DoctrineBundle >= 1.3.0, MongoDBBundle >= 3.0.0, - PHPCRBundle >= 1.0.0 and the (unversioned) CouchDBBundle supports the - compiler pass since the `CouchDB Mapping Compiler Pass pull request`_ - was merged. - .. versionadded:: 2.6 Support for defining namespace aliases was introduced in Symfony 2.6. It is safe to define the aliases with older versions of Symfony as diff --git a/cookbook/email/email.rst b/cookbook/email/email.rst index 6b205fb5770..361ada048ce 100644 --- a/cookbook/email/email.rst +++ b/cookbook/email/email.rst @@ -138,11 +138,6 @@ template might look something like this: {# Makes an absolute URL to the /images/logo.png file #} ` Activating the Serializer ------------------------- -.. versionadded:: 2.3 - The Serializer has always existed in Symfony, but prior to Symfony 2.3, - you needed to build the ``serializer`` service yourself. - The ``serializer`` service is not available by default. To turn it on, activate it in your configuration: @@ -74,11 +70,6 @@ you need it or it can be used in a controller like the following:: Adding Normalizers and Encoders ------------------------------- -.. versionadded:: 2.7 - The :class:`Symfony\\Component\\Serializer\\Normalizer\\ObjectNormalizer` - is enabled by default in Symfony 2.7. In prior versions, you needed to load - your own normalizer. - Once enabled, the ``serializer`` service will be available in the container and will be loaded with two :ref:`encoders ` (:class:`Symfony\\Component\\Serializer\\Encoder\\JsonEncoder` and @@ -129,9 +120,6 @@ Here is an example on how to load the Using Serialization Groups Annotations -------------------------------------- -.. versionadded:: 2.7 - Support for serialization groups was introduced in Symfony 2.7. - Enable :ref:`serialization groups annotation ` with the following configuration: @@ -177,9 +165,6 @@ to your class and choose which groups to use when serializing:: Enabling the Metadata Cache --------------------------- -.. versionadded:: 2.7 - Serializer was introduced in Symfony 2.7. - Metadata used by the Serializer component such as groups can be cached to enhance application performance. Any service implementing the ``Doctrine\Common\Cache\Cache`` interface can be used. diff --git a/cookbook/session/php_bridge.rst b/cookbook/session/php_bridge.rst index 80606654670..2a953dbf959 100644 --- a/cookbook/session/php_bridge.rst +++ b/cookbook/session/php_bridge.rst @@ -4,9 +4,6 @@ Bridge a legacy Application with Symfony Sessions ================================================= -.. versionadded:: 2.3 - The ability to integrate with a legacy PHP session was introduced in Symfony 2.3. - If you're integrating the Symfony full-stack Framework into a legacy application that starts the session with ``session_start()``, you may still be able to use Symfony's session management by using the PHP Bridge session. diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index 8732bddb03f..036b5798d1e 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -135,9 +135,6 @@ out all the application users. http_method_override ~~~~~~~~~~~~~~~~~~~~ -.. versionadded:: 2.3 - The ``http_method_override`` option was introduced in Symfony 2.3. - **type**: ``boolean`` **default**: ``true`` This determines whether the ``_method`` request parameter is used as the @@ -178,10 +175,6 @@ trusted_proxies Configures the IP addresses that should be trusted as proxies. For more details, see :doc:`/cookbook/request/load_balancer_reverse_proxy`. -.. versionadded:: 2.3 - CIDR notation support was introduced in Symfony 2.3, so you can whitelist - whole subnets (e.g. ``10.0.0.0/8``, ``fc00::/7``). - .. configuration-block:: .. code-block:: yaml @@ -227,9 +220,6 @@ using the following keys: * ``emacs`` * ``sublime`` -.. versionadded:: 2.3.14 - The ``emacs`` and ``sublime`` editors were introduced in Symfony 2.3.14. - You can also specify a custom url string. If you do this, all percentage signs (``%``) must be doubled to escape that character. For example, if you use PHPstorm on the Mac OS platform, you will do something like: @@ -523,11 +513,6 @@ profiler enabled ....... -.. versionadded:: 2.2 - The ``enabled`` option was introduced in Symfony 2.2. Prior to Symfony - 2.2, the profiler could only be disabled by omitting the ``framework.profiler`` - configuration entirely. - **type**: ``boolean`` **default**: ``false`` The profiler can be enabled by setting this option to ``true``. When you @@ -543,12 +528,6 @@ and ``test`` environments. collect ....... -.. versionadded:: 2.3 - The ``collect`` option was introduced in Symfony 2.3. Previously, when - ``profiler.enabled`` was ``false``, the profiler *was* actually enabled, - but the collectors were disabled. Now, the profiler and the collectors - can be controlled independently. - **type**: ``boolean`` **default**: ``true`` This option configures the way the profiler behaves when it is enabled. @@ -1300,12 +1279,6 @@ fallbacks **type**: ``string|array`` **default**: ``array('en')`` -.. versionadded:: 2.3.25 - The ``fallbacks`` option was introduced in Symfony 2.3.25. Prior - to Symfony 2.3.25, it was called ``fallback`` and only allowed one fallback - language defined as a string. Please note that you can still use the - old ``fallback`` option if you want define only one fallback. - This option is used when the translation key for the current locale wasn't found. @@ -1374,10 +1347,6 @@ cache The service that is used to persist class metadata in a cache. The service has to implement the :class:`Symfony\\Component\\Validator\\Mapping\\Cache\\CacheInterface`. -.. versionadded:: 2.8 - The ``validator.mapping.cache.doctrine.apc`` service was introduced in - Symfony 2.8. - Set this option to ``validator.mapping.cache.doctrine.apc`` to use the APC cache provide from the Doctrine project. @@ -1401,9 +1370,6 @@ error messages. strict_email ............ -.. versionadded:: 2.5 - The ``strict_email`` option was introduced in Symfony 2.5. - **type**: ``Boolean`` **default**: ``false`` If this option is enabled, the `egulias/email-validator`_ library will be @@ -1413,9 +1379,6 @@ the validator uses a simple regular expression to validate email addresses. api ... -.. versionadded:: 2.5 - The ``api`` option was introduced in Symfony 2.5. - **type**: ``string`` Starting with Symfony 2.5, the Validator component introduced a new validation diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index 9010b357350..4f678f1ca52 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -13,10 +13,6 @@ Full Default Configuration The following is the full default configuration for the security system. Each part will be explained in the next section. -.. versionadded:: 2.5 - Support for restricting security firewalls to specific http methods was introduced in - Symfony 2.5. - .. configuration-block:: .. code-block:: yaml diff --git a/reference/constraints/Collection.rst b/reference/constraints/Collection.rst index a3eb63d6b8f..e425bcc39fe 100644 --- a/reference/constraints/Collection.rst +++ b/reference/constraints/Collection.rst @@ -179,10 +179,6 @@ occur. Required and Optional Field Constraints ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. versionadded:: 2.3 - The ``Required`` and ``Optional`` constraints were moved to the namespace - ``Symfony\Component\Validator\Constraints\`` in Symfony 2.3. - Constraints for fields within a collection can be wrapped in the ``Required`` or ``Optional`` constraint to control whether they should always be applied (``Required``) or only applied when the field is present (``Optional``). diff --git a/reference/constraints/Currency.rst b/reference/constraints/Currency.rst index 7a7e85805a6..f2f2bee03bf 100644 --- a/reference/constraints/Currency.rst +++ b/reference/constraints/Currency.rst @@ -1,9 +1,6 @@ Currency ======== -.. versionadded:: 2.3 - The ``Currency`` constraint was introduced in Symfony 2.3. - Validates that a value is a valid `3-letter ISO 4217`_ currency name. +----------------+---------------------------------------------------------------------------+ diff --git a/reference/constraints/EqualTo.rst b/reference/constraints/EqualTo.rst index b3cefc8a52b..8086f8cf04f 100644 --- a/reference/constraints/EqualTo.rst +++ b/reference/constraints/EqualTo.rst @@ -1,9 +1,6 @@ EqualTo ======= -.. versionadded:: 2.3 - The ``EqualTo`` constraint was introduced in Symfony 2.3. - Validates that a value is equal to another value, defined in the options. To force that a value is *not* equal, see :doc:`/reference/constraints/NotEqualTo`. diff --git a/reference/constraints/GreaterThan.rst b/reference/constraints/GreaterThan.rst index bf47027494d..8738c82b934 100644 --- a/reference/constraints/GreaterThan.rst +++ b/reference/constraints/GreaterThan.rst @@ -1,9 +1,6 @@ GreaterThan =========== -.. versionadded:: 2.3 - The ``GreaterThan`` constraint was introduced in Symfony 2.3. - Validates that a value is greater than another value, defined in the options. To force that a value is greater than or equal to another value, see :doc:`/reference/constraints/GreaterThanOrEqual`. To force a value is less diff --git a/reference/constraints/GreaterThanOrEqual.rst b/reference/constraints/GreaterThanOrEqual.rst index 4d61dd5b077..7ce8ca6f531 100644 --- a/reference/constraints/GreaterThanOrEqual.rst +++ b/reference/constraints/GreaterThanOrEqual.rst @@ -1,9 +1,6 @@ GreaterThanOrEqual ================== -.. versionadded:: 2.3 - The ``GreaterThanOrEqual`` constraint was introduced in Symfony 2.3. - Validates that a value is greater than or equal to another value, defined in the options. To force that a value is greater than another value, see :doc:`/reference/constraints/GreaterThan`. diff --git a/reference/constraints/Iban.rst b/reference/constraints/Iban.rst index c8b88aa6007..faf7265eb11 100644 --- a/reference/constraints/Iban.rst +++ b/reference/constraints/Iban.rst @@ -1,9 +1,6 @@ Iban ==== -.. versionadded:: 2.3 - The Iban constraint was introduced in Symfony 2.3. - This constraint is used to ensure that a bank account number has the proper format of an `International Bank Account Number (IBAN)`_. IBAN is an internationally agreed means of identifying bank accounts across national diff --git a/reference/constraints/IdenticalTo.rst b/reference/constraints/IdenticalTo.rst index 7f895440ecb..a72bb2659d9 100644 --- a/reference/constraints/IdenticalTo.rst +++ b/reference/constraints/IdenticalTo.rst @@ -1,9 +1,6 @@ IdenticalTo =========== -.. versionadded:: 2.3 - The ``IdenticalTo`` constraint was introduced in Symfony 2.3. - Validates that a value is identical to another value, defined in the options. To force that a value is *not* identical, see :doc:`/reference/constraints/NotIdenticalTo`. diff --git a/reference/constraints/Isbn.rst b/reference/constraints/Isbn.rst index 66c444ee7db..ac08c249feb 100644 --- a/reference/constraints/Isbn.rst +++ b/reference/constraints/Isbn.rst @@ -1,9 +1,6 @@ Isbn ==== -.. versionadded:: 2.3 - The Isbn constraint was introduced in Symfony 2.3. - .. caution:: The ``isbn10`` and ``isbn13`` options are deprecated since Symfony 2.5 diff --git a/reference/constraints/Issn.rst b/reference/constraints/Issn.rst index f341050b29e..9fa5c04d9e5 100644 --- a/reference/constraints/Issn.rst +++ b/reference/constraints/Issn.rst @@ -1,9 +1,6 @@ Issn ==== -.. versionadded:: 2.3 - The Issn constraint was introduced in Symfony 2.3. - Validates that a value is a valid `International Standard Serial Number (ISSN)`_. diff --git a/reference/constraints/LessThan.rst b/reference/constraints/LessThan.rst index 772f6e629ee..b772701e1ba 100644 --- a/reference/constraints/LessThan.rst +++ b/reference/constraints/LessThan.rst @@ -1,9 +1,6 @@ LessThan ======== -.. versionadded:: 2.3 - The ``LessThan`` constraint was introduced in Symfony 2.3. - Validates that a value is less than another value, defined in the options. To force that a value is less than or equal to another value, see :doc:`/reference/constraints/LessThanOrEqual`. To force a value is greater diff --git a/reference/constraints/LessThanOrEqual.rst b/reference/constraints/LessThanOrEqual.rst index 22d0201a429..2bd5ac51bbc 100644 --- a/reference/constraints/LessThanOrEqual.rst +++ b/reference/constraints/LessThanOrEqual.rst @@ -1,9 +1,6 @@ LessThanOrEqual =============== -.. versionadded:: 2.3 - The ``LessThanOrEqual`` constraint was introduced in Symfony 2.3. - Validates that a value is less than or equal to another value, defined in the options. To force that a value is less than another value, see :doc:`/reference/constraints/LessThan`. diff --git a/reference/constraints/NotEqualTo.rst b/reference/constraints/NotEqualTo.rst index 7451e2eed5c..d08e3f7f30b 100644 --- a/reference/constraints/NotEqualTo.rst +++ b/reference/constraints/NotEqualTo.rst @@ -1,9 +1,6 @@ NotEqualTo ========== -.. versionadded:: 2.3 - The ``NotEqualTo`` constraint was introduced in Symfony 2.3. - Validates that a value is **not** equal to another value, defined in the options. To force that a value is equal, see :doc:`/reference/constraints/EqualTo`. diff --git a/reference/constraints/NotIdenticalTo.rst b/reference/constraints/NotIdenticalTo.rst index e54ec81634f..76dbf65b22e 100644 --- a/reference/constraints/NotIdenticalTo.rst +++ b/reference/constraints/NotIdenticalTo.rst @@ -1,9 +1,6 @@ NotIdenticalTo ============== -.. versionadded:: 2.3 - The ``NotIdenticalTo`` constraint was introduced in Symfony 2.3. - Validates that a value is **not** identical to another value, defined in the options. To force that a value is identical, see :doc:`/reference/constraints/IdenticalTo`. diff --git a/reference/constraints/Url.rst b/reference/constraints/Url.rst index 5228c91f42b..a30c1f31ce1 100644 --- a/reference/constraints/Url.rst +++ b/reference/constraints/Url.rst @@ -228,9 +228,6 @@ the ``ftp://`` type URLs to be valid, redefine the ``protocols`` array, listing checkDNS ~~~~~~~~ -.. versionadded:: 2.7 - The ``checkDNS`` option was introduced in Symfony 2.7. - **type**: ``boolean`` **default**: ``false`` By default, this constraint just validates the syntax of the given URL. If you diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index 68d601b4cf3..f9ed369a202 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -231,9 +231,6 @@ The tagged service will be removed from the container if auto_alias ---------- -.. versionadded:: 2.7 - The ``auto_alias`` tag was introduced in Symfony 2.7. - **Purpose**: Define aliases based on the value of container parameters Consider the following configuration that defines three different but related diff --git a/reference/forms/twig_reference.rst b/reference/forms/twig_reference.rst index 008bee33e00..8adce80b43f 100644 --- a/reference/forms/twig_reference.rst +++ b/reference/forms/twig_reference.rst @@ -331,9 +331,6 @@ done by using a public ``vars`` property on the get('name')->vars['label'] ?> -.. versionadded:: 2.3 - The ``method`` and ``action`` variables were introduced in Symfony 2.3. - +------------------------+-------------------------------------------------------------------------------------+ | Variable | Usage | +========================+=====================================================================================+ diff --git a/reference/forms/types/button.rst b/reference/forms/types/button.rst index 2ed5ac1750d..77dc37a3792 100644 --- a/reference/forms/types/button.rst +++ b/reference/forms/types/button.rst @@ -4,9 +4,6 @@ button Field Type ================= -.. versionadded:: 2.3 - The ``button`` type was introduced in Symfony 2.3 - A simple, non-responsive button. +----------------------+----------------------------------------------------------------------+ diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst index 58faabc5ea2..249e7b78bcb 100644 --- a/reference/forms/types/entity.rst +++ b/reference/forms/types/entity.rst @@ -106,10 +106,6 @@ Field Options choice_label ~~~~~~~~~~~~ -.. versionadded:: 2.7 - The ``choice_label`` option was introduced in Symfony 2.7. Prior to Symfony - 2.7, it was called ``property`` (which has the same functionality). - **type**: ``string`` This is the property that should be used for displaying the entities diff --git a/reference/forms/types/money.rst b/reference/forms/types/money.rst index 8f89f682108..167a57398c1 100644 --- a/reference/forms/types/money.rst +++ b/reference/forms/types/money.rst @@ -79,10 +79,6 @@ be set back on your object. scale ~~~~~ -.. versionadded:: 2.7 - The ``scale`` option was introduced in Symfony 2.7. Prior to Symfony 2.7, - it was known as ``precision``. - **type**: ``integer`` **default**: ``2`` For some reason, if you need some scale other than 2 decimal places, diff --git a/reference/forms/types/options/action.rst.inc b/reference/forms/types/options/action.rst.inc index dcc557a717f..a878355cc38 100644 --- a/reference/forms/types/options/action.rst.inc +++ b/reference/forms/types/options/action.rst.inc @@ -1,9 +1,6 @@ action ~~~~~~ -.. versionadded:: 2.3 - The ``action`` option was introduced in Symfony 2.3. - **type**: ``string`` **default**: empty string This option specifies where to send the form's data on submission (usually diff --git a/reference/forms/types/options/inherit_data.rst.inc b/reference/forms/types/options/inherit_data.rst.inc index c65ff78c7e3..716952bbecd 100644 --- a/reference/forms/types/options/inherit_data.rst.inc +++ b/reference/forms/types/options/inherit_data.rst.inc @@ -1,10 +1,6 @@ inherit_data ~~~~~~~~~~~~ -.. versionadded:: 2.3 - The ``inherit_data`` option was introduced in Symfony 2.3. Before, it - was known as ``virtual``. - **type**: ``boolean`` **default**: ``false`` This option determines if the form will inherit data from its parent form. diff --git a/reference/forms/types/options/method.rst.inc b/reference/forms/types/options/method.rst.inc index 55cf3118775..b333fef8d6c 100644 --- a/reference/forms/types/options/method.rst.inc +++ b/reference/forms/types/options/method.rst.inc @@ -1,9 +1,6 @@ method ~~~~~~ -.. versionadded:: 2.3 - The ``method`` option was introduced in Symfony 2.3. - **type**: ``string`` **default**: ``POST`` This option specifies the HTTP method used to submit the form's data. Its diff --git a/reference/forms/types/options/placeholder.rst.inc b/reference/forms/types/options/placeholder.rst.inc index afb649bdd58..d4ff8da4d11 100644 --- a/reference/forms/types/options/placeholder.rst.inc +++ b/reference/forms/types/options/placeholder.rst.inc @@ -5,10 +5,6 @@ placeholder The ``placeholder`` option was introduced in Symfony 2.6 in favor of ``empty_value``, which is available prior to 2.6. -.. versionadded:: 2.3 - Since Symfony 2.3, empty values are also supported if the ``expanded`` - option is set to true. - **type**: ``string`` or ``boolean`` This option determines whether or not a special "empty" option (e.g. "Choose diff --git a/reference/forms/types/options/scale.rst.inc b/reference/forms/types/options/scale.rst.inc index 82df7d60d3c..49d038bc686 100644 --- a/reference/forms/types/options/scale.rst.inc +++ b/reference/forms/types/options/scale.rst.inc @@ -1,10 +1,6 @@ scale ~~~~~ -.. versionadded:: 2.7 - The ``scale`` option was introduced in Symfony 2.7. Prior to Symfony 2.7, - it was known as ``precision``. - **type**: ``integer`` **default**: Locale-specific (usually around ``3``) This specifies how many decimals will be allowed until the field rounds diff --git a/reference/forms/types/percent.rst b/reference/forms/types/percent.rst index 0efc8c7c2c2..4d5bc694f23 100644 --- a/reference/forms/types/percent.rst +++ b/reference/forms/types/percent.rst @@ -45,10 +45,6 @@ Field Options scale ~~~~~ -.. versionadded:: 2.7 - The ``scale`` option was introduced in Symfony 2.7. Prior to Symfony 2.7, - it was known as ``precision``. - **type**: ``integer`` **default**: ``0`` By default, the input numbers are rounded. To allow for more decimal places, diff --git a/reference/forms/types/reset.rst b/reference/forms/types/reset.rst index 20b2d9dad70..ded00804e40 100644 --- a/reference/forms/types/reset.rst +++ b/reference/forms/types/reset.rst @@ -4,9 +4,6 @@ reset Field Type ================ -.. versionadded:: 2.3 - The ``reset`` type was introduced in Symfony 2.3 - A button that resets all fields to their original values. +----------------------+---------------------------------------------------------------------+ diff --git a/reference/forms/types/submit.rst b/reference/forms/types/submit.rst index 9d8c015a8d8..9cd087ff5d4 100644 --- a/reference/forms/types/submit.rst +++ b/reference/forms/types/submit.rst @@ -4,9 +4,6 @@ submit Field Type ================= -.. versionadded:: 2.3 - The ``submit`` type was introduced in Symfony 2.3 - A submit button. +----------------------+----------------------------------------------------------------------+ From 8af39ce8d9d0c838b6405faca7f923dc2420f1d8 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Fri, 31 Jul 2015 20:20:19 +0200 Subject: [PATCH 2/2] Removed deprecated articles --- .../class_loader/debug_class_loader.rst | 8 - components/class_loader/index.rst | 5 - components/console/helpers/dialoghelper.rst | 288 ------------------ components/console/helpers/index.rst | 3 - components/console/helpers/map.rst.inc | 5 +- components/console/helpers/progresshelper.rst | 91 ------ components/console/helpers/tablehelper.rst | 61 ---- components/console/introduction.rst | 7 - components/form/form_events.rst | 8 - components/yaml/introduction.rst | 11 +- cookbook/configuration/apache_router.rst | 157 ---------- cookbook/configuration/index.rst | 3 +- cookbook/form/direct_submit.rst | 38 --- cookbook/form/index.rst | 5 - cookbook/form/use_virtuals_forms.rst | 5 - reference/configuration/framework.rst | 14 - reference/configuration/twig.rst | 6 - reference/constraints/Isbn.rst | 7 - reference/forms/twig_reference.rst | 24 -- reference/forms/types/birthday.rst | 3 - reference/forms/types/checkbox.rst | 3 - reference/forms/types/choice.rst | 3 - reference/forms/types/collection.rst | 5 +- reference/forms/types/country.rst | 3 - reference/forms/types/currency.rst | 3 - reference/forms/types/date.rst | 3 - reference/forms/types/datetime.rst | 3 - reference/forms/types/email.rst | 6 - reference/forms/types/entity.rst | 3 - reference/forms/types/file.rst | 3 - reference/forms/types/form.rst | 16 - reference/forms/types/integer.rst | 3 - reference/forms/types/language.rst | 3 - reference/forms/types/locale.rst | 3 - reference/forms/types/money.rst | 3 - reference/forms/types/number.rst | 3 - .../types/options/cascade_validation.rst.inc | 25 -- .../forms/types/options/max_length.rst.inc | 17 -- reference/forms/types/options/pattern.rst.inc | 24 -- .../forms/types/options/property_path.rst.inc | 7 +- .../forms/types/options/read_only.rst.inc | 12 - reference/forms/types/password.rst | 6 - reference/forms/types/percent.rst | 3 - reference/forms/types/radio.rst | 3 - reference/forms/types/search.rst | 6 - reference/forms/types/text.rst | 6 - reference/forms/types/textarea.rst | 6 - reference/forms/types/time.rst | 3 - reference/forms/types/timezone.rst | 3 - reference/forms/types/url.rst | 6 - reference/twig_reference.rst | 14 - 51 files changed, 6 insertions(+), 950 deletions(-) delete mode 100644 components/class_loader/debug_class_loader.rst delete mode 100644 components/console/helpers/dialoghelper.rst delete mode 100644 components/console/helpers/progresshelper.rst delete mode 100644 components/console/helpers/tablehelper.rst delete mode 100644 cookbook/configuration/apache_router.rst delete mode 100644 cookbook/form/use_virtuals_forms.rst delete mode 100644 reference/forms/types/options/cascade_validation.rst.inc delete mode 100644 reference/forms/types/options/max_length.rst.inc delete mode 100644 reference/forms/types/options/pattern.rst.inc delete mode 100644 reference/forms/types/options/read_only.rst.inc diff --git a/components/class_loader/debug_class_loader.rst b/components/class_loader/debug_class_loader.rst deleted file mode 100644 index d41afe9d277..00000000000 --- a/components/class_loader/debug_class_loader.rst +++ /dev/null @@ -1,8 +0,0 @@ -Debugging a Class Loader -======================== - -.. caution:: - - The ``DebugClassLoader`` from the ClassLoader component was deprecated - in Symfony 2.5 and will be removed in Symfony 3.0. Use the - :doc:`DebugClassLoader provided by the Debug component `. diff --git a/components/class_loader/index.rst b/components/class_loader/index.rst index 5215b57291d..01225f4d523 100644 --- a/components/class_loader/index.rst +++ b/components/class_loader/index.rst @@ -10,8 +10,3 @@ ClassLoader map_class_loader cache_class_loader class_map_generator - -.. toctree:: - :hidden: - - debug_class_loader diff --git a/components/console/helpers/dialoghelper.rst b/components/console/helpers/dialoghelper.rst deleted file mode 100644 index 7b1555c0f3b..00000000000 --- a/components/console/helpers/dialoghelper.rst +++ /dev/null @@ -1,288 +0,0 @@ -.. index:: - single: Console Helpers; Dialog Helper - -Dialog Helper -============= - -.. caution:: - - The Dialog Helper was deprecated in Symfony 2.5 and will be removed in - Symfony 3.0. You should now use the - :doc:`Question Helper ` instead, - which is simpler to use. - -The :class:`Symfony\\Component\\Console\\Helper\\DialogHelper` provides -functions to ask the user for more information. It is included in the default -helper set, which you can get by calling -:method:`Symfony\\Component\\Console\\Command\\Command::getHelperSet`:: - - $dialog = $this->getHelper('dialog'); - -All the methods inside the Dialog Helper have an -:class:`Symfony\\Component\\Console\\Output\\OutputInterface` as the first -argument, the question as the second argument and the default value as the last -argument. - -Asking the User for Confirmation --------------------------------- - -Suppose you want to confirm an action before actually executing it. Add -the following to your command:: - - // ... - if (!$dialog->askConfirmation( - $output, - 'Continue with this action?', - false - )) { - return; - } - -In this case, the user will be asked "Continue with this action?", and will -return ``true`` if the user answers with ``y`` or ``false`` if the user answers -with ``n``. The third argument to -:method:`Symfony\\Component\\Console\\Helper\\DialogHelper::askConfirmation` -is the default value to return if the user doesn't enter any input. Any other -input will ask the same question again. - -Asking the User for Information -------------------------------- - -You can also ask question with more than a simple yes/no answer. For instance, -if you want to know a bundle name, you can add this to your command:: - - // ... - $bundle = $dialog->ask( - $output, - 'Please enter the name of the bundle', - 'AcmeDemoBundle' - ); - -The user will be asked "Please enter the name of the bundle". They can type -some name which will be returned by the -:method:`Symfony\\Component\\Console\\Helper\\DialogHelper::ask` method. -If they leave it empty, the default value (AcmeDemoBundle here) is returned. - -Autocompletion -~~~~~~~~~~~~~~ - -You can also specify an array of potential answers for a given question. These -will be autocompleted as the user types:: - - $dialog = $this->getHelper('dialog'); - $bundleNames = array('AcmeDemoBundle', 'AcmeBlogBundle', 'AcmeStoreBundle'); - $name = $dialog->ask( - $output, - 'Please enter the name of a bundle', - 'FooBundle', - $bundleNames - ); - -Hiding the User's Response -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -You can also ask a question and hide the response. This is particularly -convenient for passwords:: - - $dialog = $this->getHelper('dialog'); - $password = $dialog->askHiddenResponse( - $output, - 'What is the database password?', - false - ); - -.. caution:: - - When you ask for a hidden response, Symfony will use either a binary, change - stty mode or use another trick to hide the response. If none is available, - it will fallback and allow the response to be visible unless you pass ``false`` - as the third argument like in the example above. In this case, a ``RuntimeException`` - would be thrown. - -Validating the Answer ---------------------- - -You can even validate the answer. For instance, in the last example you asked -for the bundle name. Following the Symfony naming conventions, it should -be suffixed with ``Bundle``. You can validate that by using the -:method:`Symfony\\Component\\Console\\Helper\\DialogHelper::askAndValidate` -method:: - - // ... - $bundle = $dialog->askAndValidate( - $output, - 'Please enter the name of the bundle', - function ($answer) { - if ('Bundle' !== substr($answer, -6)) { - throw new \RuntimeException( - 'The name of the bundle should be suffixed with \'Bundle\'' - ); - } - - return $answer; - }, - false, - 'AcmeDemoBundle' - ); - -This methods has 2 new arguments, the full signature is:: - - askAndValidate( - OutputInterface $output, - string|array $question, - callback $validator, - integer $attempts = false, - string $default = null, - array $autocomplete = null - ) - -The ``$validator`` is a callback which handles the validation. It should -throw an exception if there is something wrong. The exception message is displayed -in the console, so it is a good practice to put some useful information in it. The callback -function should also return the value of the user's input if the validation was successful. - -You can set the max number of times to ask in the ``$attempts`` argument. -If you reach this max number it will use the default value. -Using ``false`` means the amount of attempts is infinite. -The user will be asked as long as they provide an invalid answer and will only -be able to proceed if their input is valid. - -Validating a Hidden Response -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -You can also ask and validate a hidden response:: - - $dialog = $this->getHelper('dialog'); - - $validator = function ($value) { - if ('' === trim($value)) { - throw new \Exception('The password can not be empty'); - } - - return $value; - }; - - $password = $dialog->askHiddenResponseAndValidate( - $output, - 'Please enter your password', - $validator, - 20, - false - ); - -If you want to allow the response to be visible if it cannot be hidden for -some reason, pass true as the fifth argument. - -Let the User Choose from a List of Answers -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -If you have a predefined set of answers the user can choose from, you -could use the ``ask`` method described above or, to make sure the user -provided a correct answer, the ``askAndValidate`` method. Both have -the disadvantage that you need to handle incorrect values yourself. - -Instead, you can use the -:method:`Symfony\\Component\\Console\\Helper\\DialogHelper::select` -method, which makes sure that the user can only enter a valid string -from a predefined list:: - - $dialog = $this->getHelper('dialog'); - $colors = array('red', 'blue', 'yellow'); - - $color = $dialog->select( - $output, - 'Please select your favorite color (default to red)', - $colors, - 0 - ); - $output->writeln('You have just selected: ' . $colors[$color]); - - // ... do something with the color - -The option which should be selected by default is provided with the fourth -argument. The default is ``null``, which means that no option is the default one. - -If the user enters an invalid string, an error message is shown and the user -is asked to provide the answer another time, until they enter a valid string -or the maximum attempts is reached (which you can define in the fifth -argument). The default value for the attempts is ``false``, which means infinite -attempts. You can define your own error message in the sixth argument. - -Multiple Choices -................ - -Sometimes, multiple answers can be given. The DialogHelper provides this -feature using comma separated values. This is disabled by default, to enable -this set the seventh argument to ``true``:: - - // ... - - $selected = $dialog->select( - $output, - 'Please select your favorite color (default to red)', - $colors, - 0, - false, - 'Value "%s" is invalid', - true // enable multiselect - ); - - $selectedColors = array_map(function ($c) use ($colors) { - return $colors[$c]; - }, $selected); - - $output->writeln( - 'You have just selected: ' . implode(', ', $selectedColors) - ); - -Now, when the user enters ``1,2``, the result will be: -``You have just selected: blue, yellow``. - -Testing a Command which Expects Input -------------------------------------- - -If you want to write a unit test for a command which expects some kind of input -from the command line, you need to overwrite the HelperSet used by the command:: - - use Symfony\Component\Console\Application; - use Symfony\Component\Console\Helper\DialogHelper; - use Symfony\Component\Console\Helper\HelperSet; - use Symfony\Component\Console\Tester\CommandTester; - - // ... - public function testExecute() - { - // ... - $application = new Application(); - $application->add(new MyCommand()); - $command = $application->find('my:command:name'); - $commandTester = new CommandTester($command); - - $dialog = $command->getHelper('dialog'); - $dialog->setInputStream($this->getInputStream("Test\n")); - // Equals to a user inputting "Test" and hitting ENTER - // If you need to enter a confirmation, "yes\n" will work - - $commandTester->execute(array('command' => $command->getName())); - - // $this->assertRegExp('/.../', $commandTester->getDisplay()); - } - - protected function getInputStream($input) - { - $stream = fopen('php://memory', 'r+', false); - fputs($stream, $input); - rewind($stream); - - return $stream; - } - -By setting the input stream of the ``DialogHelper``, you imitate what the -console would do internally with all user input through the cli. This way -you can test any user interaction (even complex ones) by passing an appropriate -input stream. - -.. seealso:: - - You find more information about testing commands in the console component - docs about :ref:`testing console commands `. diff --git a/components/console/helpers/index.rst b/components/console/helpers/index.rst index bf51dc40c92..87c62ca7629 100644 --- a/components/console/helpers/index.rst +++ b/components/console/helpers/index.rst @@ -7,14 +7,11 @@ The Console Helpers .. toctree:: :hidden: - dialoghelper formatterhelper processhelper progressbar - progresshelper questionhelper table - tablehelper debug_formatter The Console component comes with some useful helpers. These helpers contain diff --git a/components/console/helpers/map.rst.inc b/components/console/helpers/map.rst.inc index d0913db4033..68e1e722a87 100644 --- a/components/console/helpers/map.rst.inc +++ b/components/console/helpers/map.rst.inc @@ -1,9 +1,6 @@ -* :doc:`/components/console/helpers/dialoghelper` (deprecated as of 2.5) * :doc:`/components/console/helpers/formatterhelper` * :doc:`/components/console/helpers/processhelper` * :doc:`/components/console/helpers/progressbar` -* :doc:`/components/console/helpers/progresshelper` (deprecated as of 2.5) * :doc:`/components/console/helpers/questionhelper` * :doc:`/components/console/helpers/table` -* :doc:`/components/console/helpers/tablehelper` (deprecated as of 2.5) -* :doc:`/components/console/helpers/debug_formatter` (new in 2.6) +* :doc:`/components/console/helpers/debug_formatter` diff --git a/components/console/helpers/progresshelper.rst b/components/console/helpers/progresshelper.rst deleted file mode 100644 index 10bdf2fdf88..00000000000 --- a/components/console/helpers/progresshelper.rst +++ /dev/null @@ -1,91 +0,0 @@ -.. index:: - single: Console Helpers; Progress Helper - -Progress Helper -=============== - -.. caution:: - - The Progress Helper was deprecated in Symfony 2.5 and will be removed in - Symfony 3.0. You should now use the - :doc:`Progress Bar ` instead which - is more powerful. - -When executing longer-running commands, it may be helpful to show progress -information, which updates as your command runs: - -.. image:: /images/components/console/progress.png - -To display progress details, use the :class:`Symfony\\Component\\Console\\Helper\\ProgressHelper`, -pass it a total number of units, and advance the progress as your command executes:: - - $progress = $this->getHelper('progress'); - - $progress->start($output, 50); - $i = 0; - while ($i++ < 50) { - // ... do some work - - // advances the progress bar 1 unit - $progress->advance(); - } - - $progress->finish(); - -.. tip:: - - You can also set the current progress by calling the - :method:`Symfony\\Component\\Console\\Helper\\ProgressHelper::setCurrent` - method. - -If you want to output something while the progress bar is running, -call :method:`Symfony\\Component\\Console\\Helper\\ProgressHelper::clear` first. -After you're done, call -:method:`Symfony\\Component\\Console\\Helper\\ProgressHelper::display` -to show the progress bar again. - -The appearance of the progress output can be customized as well, with a number -of different levels of verbosity. Each of these displays different possible -items - like percentage completion, a moving progress bar, or current/total -information (e.g. 10/50):: - - $progress->setFormat(ProgressHelper::FORMAT_QUIET); - $progress->setFormat(ProgressHelper::FORMAT_NORMAL); - $progress->setFormat(ProgressHelper::FORMAT_VERBOSE); - $progress->setFormat(ProgressHelper::FORMAT_QUIET_NOMAX); - // the default value - $progress->setFormat(ProgressHelper::FORMAT_NORMAL_NOMAX); - $progress->setFormat(ProgressHelper::FORMAT_VERBOSE_NOMAX); - -You can also control the different characters and the width used for the -progress bar:: - - // the finished part of the bar - $progress->setBarCharacter('='); - // the unfinished part of the bar - $progress->setEmptyBarCharacter(' '); - $progress->setProgressCharacter('|'); - $progress->setBarWidth(50); - -To see other available options, check the API documentation for -:class:`Symfony\\Component\\Console\\Helper\\ProgressHelper`. - -.. caution:: - - For performance reasons, be careful if you set the total number of steps - to a high number. For example, if you're iterating over a large number of - items, consider setting the redraw frequency to a higher value by calling - :method:`Symfony\\Component\\Console\\Helper\\ProgressHelper::setRedrawFrequency`, - so it updates on only some iterations:: - - $progress->start($output, 50000); - - // updates every 100 iterations - $progress->setRedrawFrequency(100); - - $i = 0; - while ($i++ < 50000) { - // ... do some work - - $progress->advance(); - } diff --git a/components/console/helpers/tablehelper.rst b/components/console/helpers/tablehelper.rst deleted file mode 100644 index 1ec472f78e4..00000000000 --- a/components/console/helpers/tablehelper.rst +++ /dev/null @@ -1,61 +0,0 @@ -.. index:: - single: Console Helpers; Table Helper - -Table Helper -============ - -.. caution:: - - The Table Helper was deprecated in Symfony 2.5 and will be removed in - Symfony 3.0. You should now use the - :doc:`Table ` class instead which is - more powerful. - -When building a console application it may be useful to display tabular data: - -.. image:: /images/components/console/table.png - -To display a table, use the :class:`Symfony\\Component\\Console\\Helper\\TableHelper`, -set headers, rows and render:: - - $table = $this->getHelper('table'); - $table - ->setHeaders(array('ISBN', 'Title', 'Author')) - ->setRows(array( - array('99921-58-10-7', 'Divine Comedy', 'Dante Alighieri'), - array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens'), - array('960-425-059-0', 'The Lord of the Rings', 'J. R. R. Tolkien'), - array('80-902734-1-6', 'And Then There Were None', 'Agatha Christie'), - )) - ; - $table->render($output); - -The table layout can be customized as well. There are two ways to customize -table rendering: using named layouts or by customizing rendering options. - -Customize Table Layout using Named Layouts ------------------------------------------- - -The Table helper ships with three preconfigured table layouts: - -* ``TableHelper::LAYOUT_DEFAULT`` - -* ``TableHelper::LAYOUT_BORDERLESS`` - -* ``TableHelper::LAYOUT_COMPACT`` - -Layout can be set using :method:`Symfony\\Component\\Console\\Helper\\TableHelper::setLayout` method. - -Customize Table Layout using Rendering Options ----------------------------------------------- - -You can also control table rendering by setting custom rendering option values: - -* :method:`Symfony\\Component\\Console\\Helper\\TableHelper::setPaddingChar` -* :method:`Symfony\\Component\\Console\\Helper\\TableHelper::setHorizontalBorderChar` -* :method:`Symfony\\Component\\Console\\Helper\\TableHelper::setVerticalBorderChar` -* :method:`Symfony\\Component\\Console\\Helper\\TableHelper::setCrossingChar` -* :method:`Symfony\\Component\\Console\\Helper\\TableHelper::setCellHeaderFormat` -* :method:`Symfony\\Component\\Console\\Helper\\TableHelper::setCellRowFormat` -* :method:`Symfony\\Component\\Console\\Helper\\TableHelper::setBorderFormat` -* :method:`Symfony\\Component\\Console\\Helper\\TableHelper::setPadType` diff --git a/components/console/introduction.rst b/components/console/introduction.rst index c53ad5878e2..65783bdc790 100644 --- a/components/console/introduction.rst +++ b/components/console/introduction.rst @@ -222,13 +222,6 @@ verbosity levels:: // ... } -.. note:: - - These semantic methods are defined in the ``OutputInterface`` starting from - Symfony 3.0. In previous Symfony versions they are defined in the different - implementations of the interface (e.g. :class:`Symfony\\Component\\Console\\Output\\Output`) - in order to keep backwards compatibility. - When the quiet level is used, all output is suppressed as the default :method:`Symfony\\Component\\Console\\Output\\Output::write` method returns without actually printing. diff --git a/components/form/form_events.rst b/components/form/form_events.rst index 005a99d9a35..664239e529d 100644 --- a/components/form/form_events.rst +++ b/components/form/form_events.rst @@ -264,14 +264,6 @@ Name ``FormEvents`` Constant Event's Data ``form.post_bind`` ``FormEvents::POST_SUBMIT`` View data ====================== ============================= =============== -.. caution:: - - The ``FormEvents::PRE_BIND``, ``FormEvents::BIND`` and - ``FormEvents::POST_BIND`` constants will be removed in version 3.0 of - Symfony. - The event names still keep their original values, so make sure you use the - ``FormEvents`` constants in your code for forward compatibility. - Event Listeners ~~~~~~~~~~~~~~~ diff --git a/components/yaml/introduction.rst b/components/yaml/introduction.rst index 66910de0450..5560a97d963 100644 --- a/components/yaml/introduction.rst +++ b/components/yaml/introduction.rst @@ -136,15 +136,8 @@ It may also be convenient to use the $yaml = Yaml::parse(file_get_contents('/path/to/file.yml')); The :method:`Symfony\\Component\\Yaml\\Yaml::parse` static method takes a YAML -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. - -.. caution:: - - Because it is currently possible to pass a filename to this method, you - must validate the input first. Passing a filename is deprecated in - Symfony 2.2, and will be removed in Symfony 3.0. +string. Internally, it calls the +:method:`Symfony\\Component\\Yaml\\Parser::parse` method. .. _components-yaml-dump: diff --git a/cookbook/configuration/apache_router.rst b/cookbook/configuration/apache_router.rst deleted file mode 100644 index a8b4f8a7c33..00000000000 --- a/cookbook/configuration/apache_router.rst +++ /dev/null @@ -1,157 +0,0 @@ -.. index:: - single: Apache Router - -How to Use the Apache Router -============================ - -.. caution:: - - **Using the Apache Router is no longer considered a good practice**. - The small increase obtained in the application routing performance is not - worth the hassle of continuously updating the routes configuration. - - The Apache Router will be removed in Symfony 3 and it's highly recommended - to not use it in your applications. - -Symfony, while fast out of the box, also provides various ways to increase that -speed with a little bit of tweaking. One of these ways is by letting Apache -handle routes directly, rather than using Symfony for this task. - -.. caution:: - - Apache router was deprecated in Symfony 2.5 and will be removed in Symfony - 3.0. Since the PHP implementation of the Router was improved, performance - gains were no longer significant (while it's very hard to replicate the - same behavior). - -Change Router Configuration Parameters --------------------------------------- - -To dump Apache routes you must first tweak some configuration parameters to tell -Symfony to use the ``ApacheUrlMatcher`` instead of the default one: - -.. configuration-block:: - - .. code-block:: yaml - - # app/config/config_prod.yml - parameters: - router.options.matcher.cache_class: ~ # disable router cache - router.options.matcher_class: Symfony\Component\Routing\Matcher\ApacheUrlMatcher - - .. code-block:: xml - - - - null - - Symfony\Component\Routing\Matcher\ApacheUrlMatcher - - - - .. code-block:: php - - // app/config/config_prod.php - $container->setParameter('router.options.matcher.cache_class', null); // disable router cache - $container->setParameter( - 'router.options.matcher_class', - 'Symfony\Component\Routing\Matcher\ApacheUrlMatcher' - ); - -.. tip:: - - Note that :class:`Symfony\\Component\\Routing\\Matcher\\ApacheUrlMatcher` - extends :class:`Symfony\\Component\\Routing\\Matcher\\UrlMatcher` so even - if you don't regenerate the mod_rewrite rules, everything will work (because - at the end of ``ApacheUrlMatcher::match()`` a call to ``parent::match()`` - is done). - -Generating mod_rewrite Rules ----------------------------- - -To test that it's working, create a very basic route for the AppBundle: - -.. configuration-block:: - - .. code-block:: yaml - - # app/config/routing.yml - hello: - path: /hello/{name} - defaults: { _controller: AppBundle:Greet:hello } - - .. code-block:: xml - - - - AppBundle:Greet:hello - - - .. code-block:: php - - // app/config/routing.php - $collection->add('hello', new Route('/hello/{name}', array( - '_controller' => 'AppBundle:Greet:hello', - ))); - -Now generate the mod_rewrite rules: - -.. code-block:: bash - - $ php app/console router:dump-apache -e=prod --no-debug - -Which should roughly output the following: - -.. code-block:: apache - - # skip "real" requests - RewriteCond %{REQUEST_FILENAME} -f - RewriteRule .* - [QSA,L] - - # hello - RewriteCond %{REQUEST_URI} ^/hello/([^/]+?)$ - RewriteRule .* app.php [QSA,L,E=_ROUTING__route:hello,E=_ROUTING_name:%1,E=_ROUTING__controller:AppBundle\:Greet\:hello] - -You can now rewrite ``web/.htaccess`` to use the new rules, so with this example -it should look like this: - -.. code-block:: apache - - - RewriteEngine On - - # skip "real" requests - RewriteCond %{REQUEST_FILENAME} -f - RewriteRule .* - [QSA,L] - - # hello - RewriteCond %{REQUEST_URI} ^/hello/([^/]+?)$ - RewriteRule .* app.php [QSA,L,E=_ROUTING__route:hello,E=_ROUTING_name:%1,E=_ROUTING__controller:AppBundle\:Greet\:hello] - - -.. note:: - - The procedure above should be done each time you add/change a route if you - want to take full advantage of this setup. - -That's it! -You're now all set to use Apache routes. - -Additional Tweaks ------------------ - -To save some processing time, change occurrences of ``Request`` -to ``ApacheRequest`` in ``web/app.php``:: - - // web/app.php - - require_once __DIR__.'/../app/bootstrap.php.cache'; - require_once __DIR__.'/../app/AppKernel.php'; - // require_once __DIR__.'/../app/AppCache.php'; - - use Symfony\Component\HttpFoundation\ApacheRequest; - - $kernel = new AppKernel('prod', false); - $kernel->loadClassCache(); - // $kernel = new AppCache($kernel); - $kernel->handle(ApacheRequest::createFromGlobals())->send(); diff --git a/cookbook/configuration/index.rst b/cookbook/configuration/index.rst index 8bac5cf43be..cf6454a3305 100644 --- a/cookbook/configuration/index.rst +++ b/cookbook/configuration/index.rst @@ -10,7 +10,6 @@ Configuration front_controllers_and_kernel external_parameters pdo_session_storage - apache_router web_server_configuration configuration_organization - mongodb_session_storage \ No newline at end of file + mongodb_session_storage diff --git a/cookbook/form/direct_submit.rst b/cookbook/form/direct_submit.rst index abad7bfdc89..0e98505669d 100644 --- a/cookbook/form/direct_submit.rst +++ b/cookbook/form/direct_submit.rst @@ -76,41 +76,3 @@ method, pass the submitted data directly to directly on the field:: $form->get('firstName')->submit('Fabien'); - -.. _cookbook-form-submit-request: - -Passing a Request to Form::submit() (Deprecated) ------------------------------------------------- - -Before Symfony 2.3, the :method:`Symfony\\Component\\Form\\FormInterface::submit` -method accepted a :class:`Symfony\\Component\\HttpFoundation\\Request` object as -a convenient shortcut to the previous example:: - - use Symfony\Component\HttpFoundation\Request; - // ... - - public function newAction(Request $request) - { - $form = $this->createFormBuilder() - // ... - ->getForm(); - - if ($request->isMethod('POST')) { - $form->submit($request); - - if ($form->isValid()) { - // perform some action... - - return $this->redirectToRoute('task_success'); - } - } - - return $this->render('AcmeTaskBundle:Default:new.html.twig', array( - 'form' => $form->createView(), - )); - } - -Passing the :class:`Symfony\\Component\\HttpFoundation\\Request` directly to -:method:`Symfony\\Component\\Form\\FormInterface::submit` still works, but is -deprecated and will be removed in Symfony 3.0. You should use the method -:method:`Symfony\\Component\\Form\\FormInterface::handleRequest` instead. diff --git a/cookbook/form/index.rst b/cookbook/form/index.rst index 5aea7405d4c..d148a76ac55 100644 --- a/cookbook/form/index.rst +++ b/cookbook/form/index.rst @@ -14,8 +14,3 @@ Form unit_testing use_empty_data direct_submit - -.. toctree:: - :hidden: - - use_virtuals_forms diff --git a/cookbook/form/use_virtuals_forms.rst b/cookbook/form/use_virtuals_forms.rst deleted file mode 100644 index 0de48e6ecb7..00000000000 --- a/cookbook/form/use_virtuals_forms.rst +++ /dev/null @@ -1,5 +0,0 @@ -How to Use the virtual Form Field Option -======================================== - -As of Symfony 2.3, the ``virtual`` option is renamed to ``inherit_data``. You -can read everything about the new option in ":doc:`/cookbook/form/inherit_data_option`". diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index 036b5798d1e..e8bdf667df3 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -31,7 +31,6 @@ Configuration * :ref:`enabled ` * `csrf_protection`_ * :ref:`enabled ` - * `field_name`_ (deprecated as of 2.4) * `esi`_ * :ref:`enabled ` * `fragments`_ @@ -414,18 +413,6 @@ If you're using forms, but want to avoid starting your session (e.g. using forms in an API-only website), ``csrf_protection`` will need to be set to ``false``. -field_name -.......... - -.. caution:: - - The ``framework.csrf_protection.field_name`` setting is deprecated as - of Symfony 2.4, use ``framework.form.csrf_protection.field_name`` instead. - -**type**: ``string`` **default**: ``"_token"`` - -The name of the hidden field used to render the :ref:`CSRF token `. - esi ~~~ @@ -1496,7 +1483,6 @@ Full Default Configuration csrf_protection: enabled: false - field_name: _token # Deprecated since 2.4, to be removed in 3.0. Use form.csrf_protection.field_name instead # form configuration form: diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst index 0cc02ba58a5..6b7985e9314 100644 --- a/reference/configuration/twig.rst +++ b/reference/configuration/twig.rst @@ -106,12 +106,6 @@ TwigBundle Configuration ("twig") ), )); -.. caution:: - - The ``twig.form`` (```` tag for xml) configuration key - has been deprecated and will be removed in 3.0. Instead, use the ``twig.form_themes`` - option. - Configuration ------------- diff --git a/reference/constraints/Isbn.rst b/reference/constraints/Isbn.rst index ac08c249feb..d528e99683c 100644 --- a/reference/constraints/Isbn.rst +++ b/reference/constraints/Isbn.rst @@ -1,13 +1,6 @@ Isbn ==== -.. caution:: - - The ``isbn10`` and ``isbn13`` options are deprecated since Symfony 2.5 - and will be removed in Symfony 3.0. Use the ``type`` option instead. - Furthermore, when using the ``type`` option, lowercase characters are no - longer supported starting in Symfony 2.5, as they are not allowed in ISBNs. - This constraint validates that an `International Standard Book Number (ISBN)`_ is either a valid ISBN-10 or a valid ISBN-13. diff --git a/reference/forms/twig_reference.rst b/reference/forms/twig_reference.rst index 8adce80b43f..6dd97709b2d 100644 --- a/reference/forms/twig_reference.rst +++ b/reference/forms/twig_reference.rst @@ -180,24 +180,6 @@ obvious (since it'll render the field for you). {{ form_rest(form) }} -.. _reference-forms-twig-enctype: - -form_enctype(view) ------------------- - -.. note:: - - This helper was deprecated in Symfony 2.3 and will be removed in Symfony - 3.0. You should use ``form_start()`` instead. - -If the form contains at least one file upload field, this will render the -required ``enctype="multipart/form-data"`` form attribute. It's always a -good idea to include this in your form tag: - -.. code-block:: html+jinja - -
- Form Tests Reference -------------------- @@ -360,12 +342,6 @@ done by using a public ``vars`` property on the | ``required`` | If ``true``, a ``required`` attribute is added to the field to activate HTML5 | | | validation. Additionally, a ``required`` class is added to the label. | +------------------------+-------------------------------------------------------------------------------------+ -| ``max_length`` | Adds a ``maxlength`` HTML attribute to the element. (deprecated as of 2.5, to be | -| | removed in 3.0, use ``attr["maxlength"]`` instead) | -+------------------------+-------------------------------------------------------------------------------------+ -| ``pattern`` | Adds a ``pattern`` HTML attribute to the element. (deprecated as of 2.5, to be | -| | removed in 3.0, use ``attr["pattern"]`` instead) | -+------------------------+-------------------------------------------------------------------------------------+ | ``label`` | The string label that will be rendered. | +------------------------+-------------------------------------------------------------------------------------+ | ``multipart`` | If ``true``, ``form_enctype`` will render ``enctype="multipart/form-data"``. | diff --git a/reference/forms/types/birthday.rst b/reference/forms/types/birthday.rst index 740c885efba..aa0d70cdf0a 100644 --- a/reference/forms/types/birthday.rst +++ b/reference/forms/types/birthday.rst @@ -41,7 +41,6 @@ option defaults to 120 years ago to the current year. | | - `invalid_message`_ | | | - `invalid_message_parameters`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +----------------------+-------------------------------------------------------------------------------+ | Parent type | :doc:`date ` | +----------------------+-------------------------------------------------------------------------------+ @@ -95,5 +94,3 @@ type: .. include:: /reference/forms/types/options/invalid_message_parameters.rst.inc .. include:: /reference/forms/types/options/mapped.rst.inc - -.. include:: /reference/forms/types/options/read_only.rst.inc diff --git a/reference/forms/types/checkbox.rst b/reference/forms/types/checkbox.rst index 3b45e55c582..9693f0d77ef 100644 --- a/reference/forms/types/checkbox.rst +++ b/reference/forms/types/checkbox.rst @@ -23,7 +23,6 @@ true, if the box is unchecked, the value will be set to false. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------+ | Parent type | :doc:`form ` | @@ -73,8 +72,6 @@ type: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc Form Variables diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst index 69079e4168d..86f8ee55b1f 100644 --- a/reference/forms/types/choice.rst +++ b/reference/forms/types/choice.rst @@ -32,7 +32,6 @@ option. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------------+ | Parent type | :doc:`form ` | @@ -202,8 +201,6 @@ type: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc Field Variables diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst index 85a151f063d..07df7aee2b0 100644 --- a/reference/forms/types/collection.rst +++ b/reference/forms/types/collection.rst @@ -23,8 +23,7 @@ photos). | | - `type`_ | +-------------+-----------------------------------------------------------------------------+ | Inherited | - `by_reference`_ | -| options | - `cascade_validation`_ | -| | - `empty_data`_ | +| options | - `empty_data`_ | | | - `error_bubbling`_ | | | - `error_mapping`_ | | | - `label`_ | @@ -366,8 +365,6 @@ type: .. include:: /reference/forms/types/options/by_reference.rst.inc -.. include:: /reference/forms/types/options/cascade_validation.rst.inc - .. include:: /reference/forms/types/options/empty_data.rst.inc :end-before: DEFAULT_PLACEHOLDER diff --git a/reference/forms/types/country.rst b/reference/forms/types/country.rst index e7b7226c067..aa2f0c4a7f0 100644 --- a/reference/forms/types/country.rst +++ b/reference/forms/types/country.rst @@ -42,7 +42,6 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+-----------------------------------------------------------------------+ | Parent type | :doc:`choice ` | @@ -104,6 +103,4 @@ The actual default value of this option depends on other field options: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc diff --git a/reference/forms/types/currency.rst b/reference/forms/types/currency.rst index 05201597312..6c60bb71fa5 100644 --- a/reference/forms/types/currency.rst +++ b/reference/forms/types/currency.rst @@ -35,7 +35,6 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------+ | Parent type | :doc:`choice ` | @@ -94,8 +93,6 @@ The actual default value of this option depends on other field options: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc .. _`3-letter ISO 4217`: http://en.wikipedia.org/wiki/ISO_4217 diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst index a4fda47bba1..829325b18d4 100644 --- a/reference/forms/types/date.rst +++ b/reference/forms/types/date.rst @@ -42,7 +42,6 @@ day and year) or three select boxes (see the `widget`_ option). | | - `invalid_message`_ | | | - `invalid_message_parameters`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +----------------------+-----------------------------------------------------------------------------+ | Parent type | :doc:`form ` | +----------------------+-----------------------------------------------------------------------------+ @@ -163,8 +162,6 @@ type: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - Field Variables --------------- diff --git a/reference/forms/types/datetime.rst b/reference/forms/types/datetime.rst index 58471e175b8..6895da7334b 100644 --- a/reference/forms/types/datetime.rst +++ b/reference/forms/types/datetime.rst @@ -45,7 +45,6 @@ the data can be a ``DateTime`` object, a string, a timestamp or an array. | | - `invalid_message`_ | | | - `invalid_message_parameters`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +----------------------+-----------------------------------------------------------------------------+ | Parent type | :doc:`form ` | +----------------------+-----------------------------------------------------------------------------+ @@ -176,8 +175,6 @@ type: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - Field Variables --------------- diff --git a/reference/forms/types/email.rst b/reference/forms/types/email.rst index 58b68da5cc8..84e94c82a8b 100644 --- a/reference/forms/types/email.rst +++ b/reference/forms/types/email.rst @@ -18,8 +18,6 @@ The ``email`` field is a text field that is rendered using the HTML5 | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `max_length`_ (deprecated as of 2.5) | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-------------+---------------------------------------------------------------------+ @@ -56,10 +54,6 @@ The default value is ``''`` (the empty string). .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/max_length.rst.inc - -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc .. include:: /reference/forms/types/options/trim.rst.inc diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst index 249e7b78bcb..d266a036ed2 100644 --- a/reference/forms/types/entity.rst +++ b/reference/forms/types/entity.rst @@ -39,7 +39,6 @@ objects from the database. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------+ | Parent type | :doc:`choice ` | @@ -245,6 +244,4 @@ The actual default value of this option depends on other field options: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc diff --git a/reference/forms/types/file.rst b/reference/forms/types/file.rst index 0a1e6f534f4..14f4aff413b 100644 --- a/reference/forms/types/file.rst +++ b/reference/forms/types/file.rst @@ -21,7 +21,6 @@ The ``file`` type represents a file input in your form. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+---------------------------------------------------------------------+ | Parent type | :doc:`form ` | @@ -127,8 +126,6 @@ type: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc Form Variables diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst index b5409100f4b..76af386583d 100644 --- a/reference/forms/types/form.rst +++ b/reference/forms/types/form.rst @@ -11,7 +11,6 @@ on all types for which ``form`` is the parent type. | Options | - `action`_ | | | - `allow_extra_fields`_ | | | - `by_reference`_ | -| | - `cascade_validation`_ (deprecated as of 2.8) | | | - `compound`_ | | | - `constraints`_ | | | - `data`_ | @@ -25,12 +24,9 @@ on all types for which ``form`` is the parent type. | | - `invalid_message_parameters`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `max_length`_ (deprecated as of 2.5) | | | - `method`_ | -| | - `pattern`_ (deprecated as of 2.5) | | | - `post_max_size_message`_ | | | - `property_path`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-----------+--------------------------------------------------------------------+ @@ -69,8 +65,6 @@ option on the form. .. include:: /reference/forms/types/options/by_reference.rst.inc -.. include:: /reference/forms/types/options/cascade_validation.rst.inc - .. include:: /reference/forms/types/options/compound.rst.inc .. include:: /reference/forms/types/options/constraints.rst.inc @@ -112,24 +106,14 @@ The actual default value of this option depends on other field options: .. include:: /reference/forms/types/options/mapped.rst.inc -.. _reference-form-option-max_length: - -.. include:: /reference/forms/types/options/max_length.rst.inc - .. _form-option-method: .. include:: /reference/forms/types/options/method.rst.inc -.. _reference-form-option-pattern: - -.. include:: /reference/forms/types/options/pattern.rst.inc - .. include:: /reference/forms/types/options/post_max_size_message.rst.inc .. include:: /reference/forms/types/options/property_path.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. _reference-form-option-required: .. include:: /reference/forms/types/options/required.rst.inc diff --git a/reference/forms/types/integer.rst b/reference/forms/types/integer.rst index b2d4348861e..2fb11cc61b6 100644 --- a/reference/forms/types/integer.rst +++ b/reference/forms/types/integer.rst @@ -33,7 +33,6 @@ integers. By default, all non-integer values (e.g. 6.78) will round down | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+-----------------------------------------------------------------------+ | Parent type | :doc:`form ` | @@ -114,6 +113,4 @@ The default value is ``''`` (the empty string). .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc diff --git a/reference/forms/types/language.rst b/reference/forms/types/language.rst index 621dc08b3cd..00f2b3d58fe 100644 --- a/reference/forms/types/language.rst +++ b/reference/forms/types/language.rst @@ -43,7 +43,6 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------+ | Parent type | :doc:`choice ` | @@ -105,8 +104,6 @@ The actual default value of this option depends on other field options: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc .. _`International Components for Unicode`: http://site.icu-project.org diff --git a/reference/forms/types/locale.rst b/reference/forms/types/locale.rst index 5937f73c894..3389625a8d4 100644 --- a/reference/forms/types/locale.rst +++ b/reference/forms/types/locale.rst @@ -45,7 +45,6 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------+ | Parent type | :doc:`choice ` | @@ -107,8 +106,6 @@ The actual default value of this option depends on other field options: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc .. _`ISO 639-1`: http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes diff --git a/reference/forms/types/money.rst b/reference/forms/types/money.rst index 167a57398c1..b14cde985f3 100644 --- a/reference/forms/types/money.rst +++ b/reference/forms/types/money.rst @@ -32,7 +32,6 @@ how the input and output of the data is handled. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+---------------------------------------------------------------------+ | Parent type | :doc:`form ` | @@ -123,8 +122,6 @@ The default value is ``''`` (the empty string). .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc Form Variables diff --git a/reference/forms/types/number.rst b/reference/forms/types/number.rst index 59094ac1bb9..1248c50f7e5 100644 --- a/reference/forms/types/number.rst +++ b/reference/forms/types/number.rst @@ -28,7 +28,6 @@ that you want to use for your number. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+----------------------------------------------------------------------+ | Parent type | :doc:`form ` | @@ -109,6 +108,4 @@ The default value is ``''`` (the empty string). .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc diff --git a/reference/forms/types/options/cascade_validation.rst.inc b/reference/forms/types/options/cascade_validation.rst.inc deleted file mode 100644 index 2136111fc80..00000000000 --- a/reference/forms/types/options/cascade_validation.rst.inc +++ /dev/null @@ -1,25 +0,0 @@ -cascade_validation -~~~~~~~~~~~~~~~~~~ - -.. caution:: - - The ``cascade_validation`` option has been deprecated in Symfony 2.8 and will be removed - in 3.0. Instead, use the ``Valid`` constraint in your model to cascade validation. Be aware - of the fact that the ``validation_group`` option will not be considered for child forms. - -**type**: ``boolean`` **default**: ``false`` - -Set this option to ``true`` to force validation on embedded form types. -For example, if you have a ``ProductType`` with an embedded ``CategoryType``, -setting ``cascade_validation`` to ``true`` on ``ProductType`` will cause -the data from ``CategoryType`` to also be validated. - -.. tip:: - - Instead of using this option, it is recommended that you use the :doc:`Valid ` - constraint in your model to force validation on a child object stored - on a property. This cascades only the validation but not the use of - the :ref:`validation_groups ` option on child forms. You can read more - about this in the section about :ref:`Embedding a Single Object `. - -.. include:: /reference/forms/types/options/_error_bubbling_hint.rst.inc diff --git a/reference/forms/types/options/max_length.rst.inc b/reference/forms/types/options/max_length.rst.inc deleted file mode 100644 index c108451bed0..00000000000 --- a/reference/forms/types/options/max_length.rst.inc +++ /dev/null @@ -1,17 +0,0 @@ -max_length -~~~~~~~~~~ - -.. caution:: - - The ``max_length`` option was deprecated in Symfony 2.5 and will be removed - in Symfony 3.0. Use the ``attr`` option instead by setting it to an array - with a ``maxlength`` key. - -**type**: ``integer`` **default**: ``null`` - -If this option is not null, an attribute ``maxlength`` is added, which -is used by some browsers to limit the amount of text in a field. - -This is just a browser validation, so data must still be validated -server-side. - diff --git a/reference/forms/types/options/pattern.rst.inc b/reference/forms/types/options/pattern.rst.inc deleted file mode 100644 index 0f8f0f237e8..00000000000 --- a/reference/forms/types/options/pattern.rst.inc +++ /dev/null @@ -1,24 +0,0 @@ -pattern -~~~~~~~ - -.. caution:: - - The ``pattern`` option was deprecated in Symfony 2.5 and will be removed - in Symfony 3.0. Use the ``attr`` option instead by setting it to an array - with a ``pattern`` key. - -**type**: ``string`` **default**: ``null`` - -This adds an HTML5 ``pattern`` attribute to restrict the field input by -a given regular expression. - -.. caution:: - - The ``pattern`` attribute provides client-side validation for convenience - purposes only and must not be used as a replacement for reliable - server-side validation. - -.. note:: - - When using validation constraints, this option is set automatically - for some constraints to match the server-side validation. diff --git a/reference/forms/types/options/property_path.rst.inc b/reference/forms/types/options/property_path.rst.inc index 49fa503bef1..d324fd2c358 100644 --- a/reference/forms/types/options/property_path.rst.inc +++ b/reference/forms/types/options/property_path.rst.inc @@ -1,7 +1,7 @@ property_path ~~~~~~~~~~~~~ -**type**: ``any`` **default**: ``the field's name`` +**type**: ``string`` **default**: ``the field's name`` Fields display a property value of the form's domain object by default. When the form is submitted, the submitted value is written back into the @@ -10,8 +10,3 @@ object. If you want to override the property that a field reads from and writes to, you can set the ``property_path`` option. Its default value is the field's name. - -If you wish the field to be ignored when reading or writing to the object -you can set the ``property_path`` option to ``false``, but using -``property_path`` for this purpose is deprecated, you should use the -``mapped`` option. diff --git a/reference/forms/types/options/read_only.rst.inc b/reference/forms/types/options/read_only.rst.inc deleted file mode 100644 index d19de30612b..00000000000 --- a/reference/forms/types/options/read_only.rst.inc +++ /dev/null @@ -1,12 +0,0 @@ -read_only -~~~~~~~~~ - -.. caution:: - - The ``read_only`` option has been deprecated and will be removed in 3.0. - Instead, use the ``attr`` option by setting it to an array with a ``readonly`` key. - -**type**: ``boolean`` **default**: ``false`` - -If this option is true, the field will be rendered with the ``readonly`` -attribute so that the field is not editable. diff --git a/reference/forms/types/password.rst b/reference/forms/types/password.rst index 3e971ff113f..2e4a9cb6394 100644 --- a/reference/forms/types/password.rst +++ b/reference/forms/types/password.rst @@ -21,8 +21,6 @@ The ``password`` field renders an input password text box. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `max_length`_ (deprecated as of 2.5) | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------+ | Parent type | :doc:`text ` | @@ -85,8 +83,4 @@ The default value is ``''`` (the empty string). .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/max_length.rst.inc - -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc diff --git a/reference/forms/types/percent.rst b/reference/forms/types/percent.rst index 4d5bc694f23..713ef14fce1 100644 --- a/reference/forms/types/percent.rst +++ b/reference/forms/types/percent.rst @@ -31,7 +31,6 @@ This field adds a percentage sign "``%``" after the input box. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+-----------------------------------------------------------------------+ | Parent type | :doc:`form ` | @@ -107,6 +106,4 @@ The default value is ``''`` (the empty string). .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc diff --git a/reference/forms/types/radio.rst b/reference/forms/types/radio.rst index b1adec4c6ea..295d33c1d13 100644 --- a/reference/forms/types/radio.rst +++ b/reference/forms/types/radio.rst @@ -30,7 +30,6 @@ If you want to have a boolean field, use :doc:`checkbox ` | @@ -65,8 +64,6 @@ type: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc Form Variables diff --git a/reference/forms/types/search.rst b/reference/forms/types/search.rst index 69f4f449734..a3dec92f1fd 100644 --- a/reference/forms/types/search.rst +++ b/reference/forms/types/search.rst @@ -19,8 +19,6 @@ Read about the input search field at `DiveIntoHTML5.info`_ | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `max_length`_ (deprecated as of 2.5) | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-------------+----------------------------------------------------------------------+ @@ -55,10 +53,6 @@ The default value is ``''`` (the empty string). .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/max_length.rst.inc - -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc .. include:: /reference/forms/types/options/trim.rst.inc diff --git a/reference/forms/types/text.rst b/reference/forms/types/text.rst index 38d1f784a8d..5172ac59235 100644 --- a/reference/forms/types/text.rst +++ b/reference/forms/types/text.rst @@ -17,8 +17,6 @@ The text field represents the most basic input text field. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `max_length`_ (deprecated as of 2.5) | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-------------+--------------------------------------------------------------------+ @@ -58,10 +56,6 @@ The default value is ``''`` (the empty string). .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/max_length.rst.inc - -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc .. include:: /reference/forms/types/options/trim.rst.inc diff --git a/reference/forms/types/textarea.rst b/reference/forms/types/textarea.rst index 18ce38f4a4b..179412bccf3 100644 --- a/reference/forms/types/textarea.rst +++ b/reference/forms/types/textarea.rst @@ -18,8 +18,6 @@ Renders a ``textarea`` HTML element. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `max_length`_ (deprecated as of 2.5) | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-------------+------------------------------------------------------------------------+ @@ -58,10 +56,6 @@ The default value is ``''`` (the empty string). .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/max_length.rst.inc - -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc .. include:: /reference/forms/types/options/trim.rst.inc diff --git a/reference/forms/types/time.rst b/reference/forms/types/time.rst index bfbaa7e3428..0db3f853c35 100644 --- a/reference/forms/types/time.rst +++ b/reference/forms/types/time.rst @@ -39,7 +39,6 @@ stored as a ``DateTime`` object, a string, a timestamp or an array. | | - `invalid_message`_ | | | - `invalid_message_parameters`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | +----------------------+-----------------------------------------------------------------------------+ | Parent type | form | +----------------------+-----------------------------------------------------------------------------+ @@ -173,8 +172,6 @@ type: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - Form Variables -------------- diff --git a/reference/forms/types/timezone.rst b/reference/forms/types/timezone.rst index d23ba791b0b..e2a4b15799d 100644 --- a/reference/forms/types/timezone.rst +++ b/reference/forms/types/timezone.rst @@ -38,7 +38,6 @@ you should just use the ``choice`` type directly. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | +-------------+------------------------------------------------------------------------+ | Parent type | :doc:`choice ` | @@ -100,6 +99,4 @@ The actual default value of this option depends on other field options: .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc diff --git a/reference/forms/types/url.rst b/reference/forms/types/url.rst index ff4656dd6ed..69335d55f35 100644 --- a/reference/forms/types/url.rst +++ b/reference/forms/types/url.rst @@ -21,8 +21,6 @@ have a protocol. | | - `label`_ | | | - `label_attr`_ | | | - `mapped`_ | -| | - `max_length`_ (deprecated as of 2.5) | -| | - `read_only`_ (deprecated as of 2.8) | | | - `required`_ | | | - `trim`_ | +-------------+-------------------------------------------------------------------+ @@ -71,10 +69,6 @@ The default value is ``''`` (the empty string). .. include:: /reference/forms/types/options/mapped.rst.inc -.. include:: /reference/forms/types/options/max_length.rst.inc - -.. include:: /reference/forms/types/options/read_only.rst.inc - .. include:: /reference/forms/types/options/required.rst.inc .. include:: /reference/forms/types/options/trim.rst.inc diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst index b45f0f72d02..5620024c1a9 100644 --- a/reference/twig_reference.rst +++ b/reference/twig_reference.rst @@ -168,20 +168,6 @@ Renders the HTML end tag of a form together with all fields that have not been rendered yet, more information in :ref:`the Twig Form reference `. -form_enctype -~~~~~~~~~~~~ - -.. code-block:: jinja - - {{ form_enctype(view) }} - -``view`` - **type**: ``FormView`` - -Renders the required ``enctype="multipart/form-data"`` attribute if the -form contains at least one file upload field, more information in -:ref:`the Twig Form reference `. - form_widget ~~~~~~~~~~~