Skip to content

Commit e41a352

Browse files
Merge branch '3.0' into 3.1
* 3.0: [VarDumper] Fix indentation trimming in ExceptionCaster removed @SInCE Remove and change unrelevant comments in Validator and Security components. [Validator] add missing interface use statement for phpdoc block return type. [Validator] UuidValidator must accept a Uuid constraint. [Validator] make UuidValidator class formatting consistent.
2 parents ab8c2c7 + 45b9c62 commit e41a352

File tree

54 files changed

+43
-153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+43
-153
lines changed

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
117117
* @param string $registerAliasMethodName Name of Configuration class method to
118118
* register alias.
119119
* @param string[] $aliasMap Map of alias to namespace
120-
*
121-
* @since Support for bundle alias was added in Symfony 2.6
122120
*/
123121
public function __construct($driver, array $namespaces, array $managerParameters, $driverPattern, $enabledParameter = false, $configurationPattern = '', $registerAliasMethodName = '', array $aliasMap = array())
124122
{

src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
/**
1919
* A utility for reading object IDs.
2020
*
21-
* @since 1.0
22-
*
2321
* @author Bernhard Schussek <bschussek@gmail.com>
2422
*
2523
* @internal This class is meant for internal use only.

src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
/**
1818
* Extension for collecting data of the forms on a page.
1919
*
20-
* @since 2.4
21-
*
2220
* @author Robert Schönthal <robert.schoenthal@gmail.com>
2321
* @author Bernhard Schussek <bschussek@gmail.com>
2422
*/

src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
* Listener that invokes a data collector for the {@link FormEvents::POST_SET_DATA}
2121
* and {@link FormEvents::POST_SUBMIT} events.
2222
*
23-
* @since 2.4
24-
*
2523
* @author Bernhard Schussek <bschussek@gmail.com>
2624
*/
2725
class DataCollectorListener implements EventSubscriberInterface

src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
/**
2121
* Data collector for {@link FormInterface} instances.
2222
*
23-
* @since 2.4
24-
*
2523
* @author Robert Schönthal <robert.schoenthal@gmail.com>
2624
* @author Bernhard Schussek <bschussek@gmail.com>
2725
*/

src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
/**
1919
* Collects and structures information about forms.
2020
*
21-
* @since 2.4
22-
*
2321
* @author Bernhard Schussek <bschussek@gmail.com>
2422
*/
2523
interface FormDataCollectorInterface extends DataCollectorInterface

src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
/**
2020
* Default implementation of {@link FormDataExtractorInterface}.
2121
*
22-
* @since 2.4
23-
*
2422
* @author Bernhard Schussek <bschussek@gmail.com>
2523
*/
2624
class FormDataExtractor implements FormDataExtractorInterface

src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractorInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
/**
1818
* Extracts arrays of information out of forms.
1919
*
20-
* @since 2.4
21-
*
2220
* @author Bernhard Schussek <bschussek@gmail.com>
2321
*/
2422
interface FormDataExtractorInterface

src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
/**
2222
* Proxy that invokes a data collector when creating a form and its view.
2323
*
24-
* @since 2.4
25-
*
2624
* @author Bernhard Schussek <bschussek@gmail.com>
2725
*/
2826
class ResolvedTypeDataCollectorProxy implements ResolvedFormTypeInterface

src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
* Proxy that wraps resolved types into {@link ResolvedTypeDataCollectorProxy}
2121
* instances.
2222
*
23-
* @since 2.4
24-
*
2523
* @author Bernhard Schussek <bschussek@gmail.com>
2624
*/
2725
class ResolvedTypeFactoryDataCollectorProxy implements ResolvedFormTypeFactoryInterface

0 commit comments

Comments
 (0)