minor #4767 [2.6] Removed 2.4 versionadded as version is deprecated (WouterJ)

weaverryan · weaverryan · commit 48835de6e61f · 2015-01-16T17:41:32.000-05:00
This PR was merged into the 2.6 branch. Discussion ---------- [2.6] Removed 2.4 versionadded as version is deprecated Commits ------- 89caa75 Removed 2.4 versionadded as version is deprecated
diff --git a/book/controller.rst b/book/controller.rst
@@ -683,9 +683,6 @@ content that's sent back to the client::
     $response = new Response(json_encode(array('name' => $name)));
     $response->headers->set('Content-Type', 'application/json');
 
-.. versionadded:: 2.4
-    Support for HTTP status code constants was introduced in Symfony 2.4.
-
 The ``headers`` property is a :class:`Symfony\\Component\\HttpFoundation\\HeaderBag`
 object and has some nice methods for getting and setting the headers. The
 header names are normalized so that using ``Content-Type`` is equivalent to
diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
@@ -484,9 +484,6 @@ the HTTP response being returned. Use them to improve the blog:
     // echo the headers and send the response
     $response->send();
 
-.. versionadded:: 2.4
-    Support for HTTP status code constants was introduced in Symfony 2.4.
-
 The controllers are now responsible for returning a ``Response`` object.
 To make this easier, you can add a new ``render_template()`` function, which,
 incidentally, acts quite a bit like the Symfony templating engine:
diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
@@ -287,9 +287,6 @@ interface to construct the response that needs to be returned to the client::
     // prints the HTTP headers followed by the content
     $response->send();
 
-.. versionadded:: 2.4
-    Support for HTTP status code constants was introduced in Symfony 2.4.
-
 If Symfony offered nothing else, you would already have a toolkit for easily
 accessing request information and an object-oriented interface for creating
 the response. Even as you learn the many powerful features in Symfony, keep
diff --git a/book/internals.rst b/book/internals.rst
@@ -208,10 +208,6 @@ processing must only occur on the master request).
 Events
 ~~~~~~
 
-.. versionadded:: 2.4
-    The ``isMasterRequest()`` method was introduced in Symfony 2.4.
-    Prior, the ``getRequestType()`` method must be used.
-
 Each event thrown by the Kernel is a subclass of
 :class:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent`. This means that
 each event has access to the same basic information:
diff --git a/book/routing.rst b/book/routing.rst
@@ -915,9 +915,6 @@ component documentation.
 Completely Customized Route Matching with Conditions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.4
-    Route conditions were introduced in Symfony 2.4.
-
 As you've seen, a route can be made to match only certain routing wildcards
 (via regular expressions), HTTP methods, or host names. But the routing system
 can be extended to have an almost infinite flexibility using ``conditions``:
diff --git a/book/security.rst b/book/security.rst
@@ -927,9 +927,6 @@ special attributes like this:
 
 .. _book-security-template-expression:
 
-.. versionadded:: 2.4
-    The ``expression`` functionality was introduced in Symfony 2.4.
-
 You can also use expressions inside your templates:
 
 .. configuration-block::
diff --git a/book/service_container.rst b/book/service_container.rst
@@ -624,9 +624,6 @@ the work of instantiating the classes.
 Using the Expression Language
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.4
-    The Expression Language functionality was introduced in Symfony 2.4.
-
 The service container also supports an "expression" that allows you to inject
 very specific values into a service.
 
@@ -818,9 +815,6 @@ Injecting the dependency by the setter method just needs a change of syntax:
 Injecting the Request
 ~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.4
-    The ``request_stack`` service was introduced in Symfony 2.4.
-
 As of Symfony 2.4, instead of injecting the ``request`` service, you should
 inject the ``request_stack`` service and access the ``Request`` by calling
 the :method:`Symfony\\Component\\HttpFoundation\\RequestStack::getCurrentRequest`
diff --git a/components/console/helpers/progresshelper.rst b/components/console/helpers/progresshelper.rst
@@ -7,9 +7,6 @@ Progress Helper
 .. versionadded:: 2.3
     The ``setCurrent`` method was introduced in Symfony 2.3.
 
-.. versionadded:: 2.4
-    The ``clear`` method was introduced in Symfony 2.4.
-
 .. caution::
 
     The Progress Helper was deprecated in Symfony 2.5 and will be removed in
diff --git a/components/console/helpers/tablehelper.rst b/components/console/helpers/tablehelper.rst
@@ -39,9 +39,6 @@ table rendering: using named layouts or by customizing rendering options.
 Customize Table Layout using Named Layouts
 ------------------------------------------
 
-.. versionadded:: 2.4
-    The ``TableHelper::LAYOUT_COMPACT`` layout was introduced in Symfony 2.4.
-
 The Table helper ships with three preconfigured table layouts:
 
 * ``TableHelper::LAYOUT_DEFAULT``
diff --git a/components/console/introduction.rst b/components/console/introduction.rst
@@ -203,13 +203,6 @@ level. For example::
         $output->writeln(...);
     }
 
-.. versionadded:: 2.4
-   The :method:`Symfony\\Component\\Console\\Output\\Output::isQuiet`,
-   :method:`Symfony\\Component\\Console\\Output\\Output::isVerbose`,
-   :method:`Symfony\\Component\\Console\\Output\\Output::isVeryVerbose` and
-   :method:`Symfony\\Component\\Console\\Output\\Output::isDebug`
-   methods were introduced in Symfony 2.4
-
 There are also more semantic methods you can use to test for each of the
 verbosity levels::
 
diff --git a/components/debug/class_loader.rst b/components/debug/class_loader.rst
@@ -5,10 +5,6 @@
 Debugging a Class Loader
 ========================
 
-.. versionadded:: 2.4
-    The ``DebugClassLoader`` of the Debug component was introduced in Symfony 2.4.
-    Previously, it was located in the ClassLoader component.
-
 The :class:`Symfony\\Component\\Debug\\DebugClassLoader` attempts to
 throw more helpful exceptions when a class isn't found by the registered
 autoloaders. All autoloaders that implement a ``findFile()`` method are replaced
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -102,10 +102,6 @@ Both the :method:`Symfony\\Component\\DomCrawler\\Crawler::filterXPath` and
 XML namespaces, which can be either automatically discovered or registered
 explicitly.
 
-.. versionadded:: 2.4
-    Auto discovery and explicit registration of namespaces was introduced
-    in Symfony 2.4.
-
 Consider the XML below:
 
 .. code-block:: xml
@@ -456,10 +452,6 @@ directly::
 Selecting Invalid Choice Values
 ...............................
 
-.. versionadded:: 2.4
-    The :method:`Symfony\\Component\\DomCrawler\\Form::disableValidation`
-    method was introduced in Symfony 2.4.
-
 By default, choice fields (select, radio) have internal validation activated
 to prevent you from setting invalid values. If you want to be able to set
 invalid values, you can use the  ``disableValidation()`` method on either
diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst
@@ -489,10 +489,6 @@ which returns a boolean value::
 EventDispatcher aware Events and Listeners
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.4
-    Since Symfony 2.4, the current event name and the ``EventDispatcher``
-    itself are passed to the listeners as additional arguments.
-
 The ``EventDispatcher`` always passes the dispatched event, the event's name
 and a reference to itself to the listeners. This can be used in some advanced
 usages of the ``EventDispatcher`` like dispatching other events in listeners,
diff --git a/components/expression_language/introduction.rst b/components/expression_language/introduction.rst
@@ -9,9 +9,6 @@ The ExpressionLanguage Component
     evaluate expressions. An expression is a one-liner that returns a value
     (mostly, but not limited to, Booleans).
 
-.. versionadded:: 2.4
-    The ExpressionLanguage component was introduced in Symfony 2.4.
-
 Installation
 ------------
 
diff --git a/components/filesystem/introduction.rst b/components/filesystem/introduction.rst
@@ -36,10 +36,6 @@ endpoint for filesystem operations::
         echo "An error occurred while creating your directory at ".$e->getPath();
     }
 
-.. versionadded:: 2.4
-    The ``IOExceptionInterface`` and its ``getPath`` method were introduced in
-    Symfony 2.4. Prior to 2.4, you would catch the ``IOException`` class.
-
 .. note::
 
     Methods :method:`Symfony\\Component\\Filesystem\\Filesystem::mkdir`,
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -284,10 +284,6 @@ for more information about them.
 Overriding the Request
 ~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.4
-    The :method:`Symfony\\Component\\HttpFoundation\\Request::setFactory`
-    method was introduced in Symfony 2.4.
-
 The ``Request`` class should not be overridden as it is a data object that
 represents an HTTP message. But when moving from a legacy system, adding
 methods or changing some default behavior might help. In that case, register a
@@ -335,9 +331,6 @@ code, and an array of HTTP headers::
         array('content-type' => 'text/html')
     );
 
-.. versionadded:: 2.4
-    Support for HTTP status code constants was introduced in Symfony 2.4.
-
 These information can also be manipulated after the Response object creation::
 
     $response->setContent('Hello World');
diff --git a/components/http_kernel/introduction.rst b/components/http_kernel/introduction.rst
@@ -679,10 +679,6 @@ argument as follows::
     $response = $kernel->handle($request, HttpKernelInterface::SUB_REQUEST);
     // do something with this response
 
-.. versionadded:: 2.4
-    The ``isMasterRequest()`` method was introduced in Symfony 2.4.
-    Prior, the ``getRequestType()`` method must be used.
-
 This creates another full request-response cycle where this new ``Request`` is
 transformed into a ``Response``. The only difference internally is that some
 listeners (e.g. security) may only act upon the master request. Each listener
diff --git a/components/process.rst b/components/process.rst
@@ -42,9 +42,6 @@ output. Alternatively, the :method:`Symfony\\Component\\Process\\Process::getInc
 and :method:`Symfony\\Component\\Process\\Process::getIncrementalErrorOutput`
 methods returns the new outputs since the last call.
 
-.. versionadded:: 2.4
-    The ``clearOutput()`` and ``clearErrorOutput()`` methods were introduced in Symfony 2.4.
-
 The :method:`Symfony\\Component\\Process\\Process::clearOutput` method clears
 the contents of the output and
 :method:`Symfony\\Component\\Process\\Process::clearErrorOutput` clears
@@ -236,10 +233,6 @@ check regularly::
 Process Idle Timeout
 --------------------
 
-.. versionadded:: 2.4
-   The :method:`Symfony\\Component\\Process\\Process::setIdleTimeout` method
-   was introduced in Symfony 2.4.
-
 In contrast to the timeout of the previous paragraph, the idle timeout only
 considers the time since the last output was produced by the process::
 
diff --git a/components/translation/introduction.rst b/components/translation/introduction.rst
@@ -62,9 +62,6 @@ The Translation component uses Loader classes to load catalogs. You can load
 multiple resources for the same locale, which will then be combined into one
 catalog.
 
-.. versionadded:: 2.4
-    The ``JsonFileLoader`` was introduced in Symfony 2.4.    
-
 The component comes with some default Loaders and you can create your own
 Loader too. The default loaders are:
 
diff --git a/cookbook/console/commands_as_services.rst b/cookbook/console/commands_as_services.rst
@@ -4,10 +4,6 @@
 How to Define Commands as Services
 ==================================
 
-.. versionadded:: 2.4
-   Support for registering commands in the service container was introduced in
-   Symfony 2.4.
-
 By default, Symfony will take a look in the ``Command`` directory of each
 bundle and automatically register your commands. If a command extends the
 :class:`Symfony\\Bundle\\FrameworkBundle\\Command\\ContainerAwareCommand`,
diff --git a/cookbook/console/console_command.rst b/cookbook/console/console_command.rst
@@ -181,11 +181,6 @@ instead of
         }
     }
 
-.. versionadded:: 2.4
-    Since Symfony 2.4, the ``CommandTester`` automatically detects the name of
-    the command to execute. Prior to Symfony 2.4, you need to pass it via the
-    ``command`` key.
-
 .. note::
 
     In the specific case above, the ``name`` parameter and the ``--yell`` option
diff --git a/cookbook/expression/expressions.rst b/cookbook/expression/expressions.rst
@@ -4,9 +4,6 @@
 How to use Expressions in Security, Routing, Services, and Validation
 =====================================================================
 
-.. versionadded:: 2.4
-    The expression functionality was introduced in Symfony 2.4.
-
 In Symfony 2.4, a powerful :doc:`ExpressionLanguage </components/expression_language/introduction>`
 component was added to Symfony. This allows us to add highly customized
 logic inside configuration.
@@ -28,9 +25,6 @@ For more information about how to create and work with expressions, see
 Security: Complex Access Controls with Expressions
 --------------------------------------------------
 
-.. versionadded:: 2.4
-    The expression functionality was introduced in Symfony 2.4.
-
 In addition to a role like ``ROLE_ADMIN``, the ``isGranted`` method also
 accepts an :class:`Symfony\\Component\\ExpressionLanguage\\Expression` object::
 
diff --git a/cookbook/logging/channels_handlers.rst b/cookbook/logging/channels_handlers.rst
@@ -114,10 +114,6 @@ specified.
 Configure Additional Channels without Tagged Services
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.4
-    This feature was introduced to the MonologBundle 2.4, which was first
-    packaged with Symfony 2.4.
-
 With MonologBundle 2.4 you can configure additional channels without the
 need to tag your services:
 
diff --git a/cookbook/logging/monolog_console.rst b/cookbook/logging/monolog_console.rst
@@ -4,9 +4,6 @@
 How to Configure Monolog to Display Console Messages
 ====================================================
 
-.. versionadded:: 2.4
-    This feature was introduced to the MonologBridge in Symfony 2.4.
-
 It is possible to use the console to print messages for certain
 :ref:`verbosity levels <verbosity-levels>` using the
 :class:`Symfony\\Component\\Console\\Output\\OutputInterface` instance that
diff --git a/cookbook/logging/monolog_regex_based_excludes.rst b/cookbook/logging/monolog_regex_based_excludes.rst
@@ -6,10 +6,6 @@
 How to Configure Monolog to Exclude 404 Errors from the Log
 ===========================================================
 
-.. versionadded:: 2.4
-    This feature was introduced to the MonologBundle 2.4, which was first
-    packaged with Symfony 2.4.
-
 Sometimes your logs become flooded with unwanted 404 HTTP errors, for example,
 when an attacker scans your app for some well-known application paths (e.g.
 `/phpmyadmin`). When using a ``fingers_crossed`` handler, you can exclude
diff --git a/cookbook/security/access_control.rst b/cookbook/security/access_control.rst
@@ -247,9 +247,6 @@ address):
 Securing by an Expression
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.4
-    The ``allow_if`` functionality was introduced in Symfony 2.4.
-
 Once an ``access_control`` entry is matched, you can deny access via the
 ``roles`` key or use more complex logic with an expression in the ``allow_if``
 key:
diff --git a/cookbook/security/api_key_authentication.rst b/cookbook/security/api_key_authentication.rst
@@ -11,9 +11,6 @@ passed as a query string parameter or via an HTTP header.
 The API Key Authenticator
 -------------------------
 
-.. versionadded:: 2.4
-    The ``SimplePreAuthenticatorInterface`` interface was introduced in Symfony 2.4.
-
 Authenticating a user based on the Request information should be done via a
 pre-authentication mechanism. The :class:`Symfony\\Component\\Security\\Core\\Authentication\\SimplePreAuthenticatorInterface`
 allows you to implement such a scheme really easily.
diff --git a/cookbook/security/custom_authentication_provider.rst b/cookbook/security/custom_authentication_provider.rst
@@ -168,9 +168,6 @@ set an authenticated token in the token storage if successful.
         }
     }
 
-.. versionadded:: 2.4
-    Support for HTTP status code constants was introduced in Symfony 2.4.
-
 This listener checks the request for the expected ``X-WSSE`` header, matches
 the value returned for the expected WSSE information, creates a token using
 that information, and passes the token on to the authentication manager. If
diff --git a/cookbook/security/custom_password_authenticator.rst b/cookbook/security/custom_password_authenticator.rst
@@ -13,9 +13,6 @@ Before Symfony 2.6, you had to use the password encoder to authenticate the user
 The Password Authenticator
 --------------------------
 
-.. versionadded:: 2.4
-    The ``SimpleFormAuthenticatorInterface`` interface was introduced in Symfony 2.4.
-
 .. versionadded:: 2.6
     The ``UserPasswordEncoderInterface`` interface was introduced in Symfony 2.6.
 
diff --git a/cookbook/security/firewall_restriction.rst b/cookbook/security/firewall_restriction.rst
@@ -72,10 +72,6 @@ firewalls will have the opportunity to be matched for this request.
 Restricting by Host
 -------------------
 
-.. versionadded:: 2.4
-    Support for restricting security firewalls to a specific host was introduced in
-    Symfony 2.4.
-
 If matching against the ``pattern`` only is not enough, the request can also be matched against 
 ``host``. When the configuration option ``host`` is set, the firewall will be restricted to 
 only initialize if the host from the request matches against the configuration.
diff --git a/cookbook/service_container/event_listener.rst b/cookbook/service_container/event_listener.rst
@@ -51,9 +51,6 @@ event is just one of the core kernel events::
         }
     }
 
-.. versionadded:: 2.4
-    Support for HTTP status code constants was introduced in Symfony 2.4.
-
 .. tip::
 
     Each event receives a slightly different type of ``$event`` object. For
@@ -106,10 +103,6 @@ using a special "tag":
 Request Events, Checking Types
 ------------------------------
 
-.. versionadded:: 2.4
-    The ``isMasterRequest()`` method was introduced in Symfony 2.4.
-    Prior, the ``getRequestType()`` method must be used.
-
 A single page can make several requests (one master request, and then multiple
 sub-requests), which is why when working with the ``KernelEvents::REQUEST``
 event, you might need to check the type of the request. This can be easily
diff --git a/cookbook/session/limit_metadata_writes.rst b/cookbook/session/limit_metadata_writes.rst
@@ -4,9 +4,6 @@
 Limit Session Metadata Writes
 =============================
 
-.. versionadded:: 2.4
-    The ability to limit session metadata writes was introduced in Symfony 2.4.
-
 The default behavior of PHP session is to persist the session regardless of
 whether the session data has changed or not. In Symfony, each time the session
 is accessed, metadata is recorded (session created/last used) which can be used
diff --git a/cookbook/testing/insulating_clients.rst b/cookbook/testing/insulating_clients.rst
diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
diff --git a/reference/constraints/Callback.rst b/reference/constraints/Callback.rst
diff --git a/reference/constraints/Expression.rst b/reference/constraints/Expression.rst
diff --git a/reference/constraints/Image.rst b/reference/constraints/Image.rst
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
diff --git a/reference/forms/twig_reference.rst b/reference/forms/twig_reference.rst
diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,6 @@ endpoint for filesystem operations::`
`36`	`36`	`echo "An error occurred while creating your directory at ".$e->getPath();`
`37`	`37`	`}`
`38`	`38`
`39`		`-.. versionadded:: 2.4`
`40`		- The ``IOExceptionInterface`` and its ``getPath`` method were introduced in
`41`		- Symfony 2.4. Prior to 2.4, you would catch the ``IOException`` class.
`42`		`-`
`43`	`39`	`.. note::`
`44`	`40`
`45`	`41`	Methods :method:`Symfony\\Component\\Filesystem\\Filesystem::mkdir`,
Original file line number	Diff line number	Diff line change
`@@ -181,11 +181,6 @@ instead of`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`
`184`		`-.. versionadded:: 2.4`
`185`		- Since Symfony 2.4, the ``CommandTester`` automatically detects the name of
`186`		`- the command to execute. Prior to Symfony 2.4, you need to pass it via the`
`187`		- ``command`` key.
`188`		`-`
`189`	`184`	`.. note::`
`190`	`185`
`191`	`186`	In the specific case above, the ``name`` parameter and the ``--yell`` option
Original file line number	Diff line number	Diff line change
`@@ -168,9 +168,6 @@ set an authenticated token in the token storage if successful.`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`
`171`		`-.. versionadded:: 2.4`
`172`		`- Support for HTTP status code constants was introduced in Symfony 2.4.`
`173`		`-`
`174`	`171`	This listener checks the request for the expected ``X-WSSE`` header, matches
`175`	`172`	`the value returned for the expected WSSE information, creates a token using`
`176`	`173`	`that information, and passes the token on to the authentication manager. If`