diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php index e0dcaae6c2..c3b7588e95 100644 --- a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php +++ b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php @@ -27,13 +27,14 @@ use Symfony\Component\Security\Core\Exception\TokenNotFoundException; * and to do the conversion of the datetime column. * * In order to use this class, you need the following table in your database: - * CREATE TABLE `rememberme_token` ( - * `series` char(88) UNIQUE PRIMARY KEY NOT NULL, - * `value` char(88) NOT NULL, - * `lastUsed` datetime NOT NULL, - * `class` varchar(100) NOT NULL, - * `username` varchar(200) NOT NULL - * ); + * + * CREATE TABLE `rememberme_token` ( + * `series` char(88) UNIQUE PRIMARY KEY NOT NULL, + * `value` char(88) NOT NULL, + * `lastUsed` datetime NOT NULL, + * `class` varchar(100) NOT NULL, + * `username` varchar(200) NOT NULL + * ); */ class DoctrineTokenProvider implements TokenProviderInterface { diff --git a/src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php index 7cdbb77b43..a4d7d6f690 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php @@ -19,11 +19,10 @@ use Twig\TokenParser\AbstractTokenParser; * Token Parser for the 'dump' tag. * * Dump variables with: - *
- * {% dump %} - * {% dump foo %} - * {% dump foo, bar %} - *+ * + * {% dump %} + * {% dump foo %} + * {% dump foo, bar %} * * @author Julien Galenski
- * echo $view['form']->csrfToken('rm_user_'.$user->getId());
- *
+ * echo $view['form']->csrfToken('rm_user_'.$user->getId());
*
* Check the token in your action using the same intention.
*
- *
- * $csrfProvider = $this->get('security.csrf.token_generator');
- * if (!$csrfProvider->isCsrfTokenValid('rm_user_'.$user->getId(), $token)) {
- * throw new \RuntimeException('CSRF attack detected.');
- * }
- *
+ * $csrfProvider = $this->get('security.csrf.token_generator');
+ * if (!$csrfProvider->isCsrfTokenValid('rm_user_'.$user->getId(), $token)) {
+ * throw new \RuntimeException('CSRF attack detected.');
+ * }
*
* @param string $intention The intention of the protected action
*
diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
index 6af4a61e47..91e98eaeb3 100644
--- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
+++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
@@ -342,27 +342,31 @@ class PrototypedArrayNode extends ArrayNode
* one is same as this->keyAttribute and the other is 'value', then the prototype will be different.
*
* For example, assume $this->keyAttribute is 'name' and the value array is as follows:
- * array(
+ *
* array(
- * 'name' => 'name001',
- * 'value' => 'value001'
+ * array(
+ * 'name' => 'name001',
+ * 'value' => 'value001'
+ * )
* )
- * )
*
* Now, the key is 0 and the child node is:
- * array(
- * 'name' => 'name001',
- * 'value' => 'value001'
- * )
+ *
+ * array(
+ * 'name' => 'name001',
+ * 'value' => 'value001'
+ * )
*
* When normalizing the value array, the 'name' element will removed from the child node
* and its value becomes the new key of the child node:
- * array(
- * 'name001' => array('value' => 'value001')
- * )
+ *
+ * array(
+ * 'name001' => array('value' => 'value001')
+ * )
*
* Now only 'value' element is left in the child node which can be further simplified into a string:
- * array('name001' => 'value001')
+ *
+ * array('name001' => 'value001')
*
* Now, the key becomes 'name001' and the child node becomes 'value001' and
* the prototype of child node 'name001' should be a ScalarNode instead of an ArrayNode instance.
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
index ce5a819e14..f3fc3b0b0a 100644
--- a/src/Symfony/Component/Console/Helper/Table.php
+++ b/src/Symfony/Component/Console/Helper/Table.php
@@ -224,15 +224,14 @@ class Table
* Renders table to output.
*
* Example:
- *
- * +---------------+-----------------------+------------------+
- * | ISBN | Title | Author |
- * +---------------+-----------------------+------------------+
- * | 99921-58-10-7 | Divine Comedy | Dante Alighieri |
- * | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
- * | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
- * +---------------+-----------------------+------------------+
- *
+ *
+ * +---------------+-----------------------+------------------+
+ * | ISBN | Title | Author |
+ * +---------------+-----------------------+------------------+
+ * | 99921-58-10-7 | Divine Comedy | Dante Alighieri |
+ * | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
+ * | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
+ * +---------------+-----------------------+------------------+
*/
public function render()
{
@@ -266,7 +265,9 @@ class Table
/**
* Renders horizontal header separator.
*
- * Example: +-----+-----------+-------+
+ * Example:
+ *
+ * +-----+-----------+-------+
*/
private function renderRowSeparator()
{
@@ -297,7 +298,9 @@ class Table
/**
* Renders table row.
*
- * Example: | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
+ * Example:
+ *
+ * | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
*
* @param array $row
* @param string $cellFormat
diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php
index dc6e2701f1..72f784cebb 100644
--- a/src/Symfony/Component/Console/Input/InputDefinition.php
+++ b/src/Symfony/Component/Console/Input/InputDefinition.php
@@ -23,8 +23,8 @@ use Symfony\Component\Console\Output\BufferedOutput;
* Usage:
*
* $definition = new InputDefinition(array(
- * new InputArgument('name', InputArgument::REQUIRED),
- * new InputOption('foo', 'f', InputOption::VALUE_REQUIRED),
+ * new InputArgument('name', InputArgument::REQUIRED),
+ * new InputOption('foo', 'f', InputOption::VALUE_REQUIRED),
* ));
*
* @author Fabien Potencier
+ *
* echo Crawler::xpathLiteral('foo " bar');
* //prints 'foo " bar'
*
@@ -796,7 +796,7 @@ class Crawler extends \SplObjectStorage
*
* echo Crawler::xpathLiteral('a\'b"c');
* //prints concat('a', "'", 'b"c')
- *
+ *
*
* @param string $s String to be escaped
*
diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
index d2acb15ada..6398cc6069 100644
--- a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
+++ b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php
@@ -186,9 +186,7 @@ class FormFieldRegistry
/**
* Splits a field name into segments as a web browser would do.
*
- *
* getSegments('base[foo][3][]') = array('base', 'foo, '3', '');
- *
*
* @param string $name The name of the field
*
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index 757760cf3e..1ee9017356 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -36,7 +36,7 @@ use Symfony\Component\Finder\Iterator\SortableIterator;
*
* All methods return the current Finder object to allow easy chaining:
*
- * $finder = Finder::create()->files()->name('*.php')->in(__DIR__);
+ * $finder = Finder::create()->files()->name('*.php')->in(__DIR__);
*
* @author Fabien Potencier
- * $choices = array(true, false);
- * $labels = array('Agree', 'Disagree');
- * $choiceList = new ArrayChoiceList($choices, $labels);
- *
+ * $choices = array(true, false);
+ * $labels = array('Agree', 'Disagree');
+ * $choiceList = new ArrayChoiceList($choices, $labels);
*
* @author Bernhard Schussek
- * $choices = array($user1, $user2);
+ * $choices = array($user1, $user2);
*
- * // call getName() to determine the choice labels
- * $choiceList = new ObjectChoiceList($choices, 'name');
- *
+ * // call getName() to determine the choice labels
+ * $choiceList = new ObjectChoiceList($choices, 'name');
*
* @author Bernhard Schussek
- * $choiceList = new SimpleChoiceList(array(
- * 'creditcard' => 'Credit card payment',
- * 'cash' => 'Cash payment',
- * ));
- *
+ * $choiceList = new SimpleChoiceList(array(
+ * 'creditcard' => 'Credit card payment',
+ * 'cash' => 'Cash payment',
+ * ));
*
* @author Bernhard Schussek
- * children[address].children[office].data.street
- *
+ * children[address].children[office].data.street
*
* In this example, "address" and "office" map to forms, while
* "street does not.
diff --git a/src/Symfony/Component/Form/FormRendererEngineInterface.php b/src/Symfony/Component/Form/FormRendererEngineInterface.php
index e2300ef5a2..d283837432 100644
--- a/src/Symfony/Component/Form/FormRendererEngineInterface.php
+++ b/src/Symfony/Component/Form/FormRendererEngineInterface.php
@@ -53,11 +53,9 @@ interface FormRendererEngineInterface
* and continues with the child of that root, the child of that child etc.
* The following is an example for a block hierarchy:
*
- *
- * form_widget
- * text_widget
- * url_widget
- *
+ * form_widget
+ * text_widget
+ * url_widget
*
* In this example, "url_widget" is the most specific block, while the other
* blocks are its ancestors in the hierarchy.
@@ -91,11 +89,9 @@ interface FormRendererEngineInterface
* and continues with the child of that root, the child of that child etc.
* The following is an example for a block hierarchy:
*
- *
- * form_widget
- * text_widget
- * url_widget
- *
+ * form_widget
+ * text_widget
+ * url_widget
*
* The second parameter $hierarchyLevel determines the level of the hierarchy
* that should be rendered.
diff --git a/src/Symfony/Component/Form/FormRendererInterface.php b/src/Symfony/Component/Form/FormRendererInterface.php
index f0f51e4f59..edddeff5b7 100644
--- a/src/Symfony/Component/Form/FormRendererInterface.php
+++ b/src/Symfony/Component/Form/FormRendererInterface.php
@@ -69,18 +69,14 @@ interface FormRendererInterface
* Use this helper for CSRF protection without the overhead of creating a
* form.
*
- *
- *
- *
+ *
*
* Check the token in your action using the same token ID.
*
- *
- * $csrfProvider = $this->get('security.csrf.token_generator');
- * if (!$csrfProvider->isCsrfTokenValid('rm_user_'.$user->getId(), $token)) {
- * throw new \RuntimeException('CSRF attack detected.');
- * }
- *
+ * $csrfProvider = $this->get('security.csrf.token_generator');
+ * if (!$csrfProvider->isCsrfTokenValid('rm_user_'.$user->getId(), $token)) {
+ * throw new \RuntimeException('CSRF attack detected.');
+ * }
*
* @param string $tokenId The ID of the CSRF token
*
diff --git a/src/Symfony/Component/Form/Forms.php b/src/Symfony/Component/Form/Forms.php
index 2a47513f61..079ceda750 100644
--- a/src/Symfony/Component/Form/Forms.php
+++ b/src/Symfony/Component/Form/Forms.php
@@ -18,29 +18,25 @@ use Symfony\Component\Form\Extension\Core\CoreExtension;
*
* Use this class to conveniently create new form factories:
*
- *
- * use Symfony\Component\Form\Forms;
+ * use Symfony\Component\Form\Forms;
*
- * $formFactory = Forms::createFormFactory();
+ * $formFactory = Forms::createFormFactory();
*
- * $form = $formFactory->createBuilder()
- * ->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
- * ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
- * ->add('age', 'Symfony\Component\Form\Extension\Core\Type\IntegerType')
- * ->add('gender', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array(
- * 'choices' => array('Male' => 'm', 'Female' => 'f'),
- * 'choices_as_values' => true,
- * ))
- * ->getForm();
- *
+ * $form = $formFactory->createBuilder()
+ * ->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
+ * ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
+ * ->add('age', 'Symfony\Component\Form\Extension\Core\Type\IntegerType')
+ * ->add('gender', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array(
+ * 'choices' => array('Male' => 'm', 'Female' => 'f'),
+ * 'choices_as_values' => true,
+ * ))
+ * ->getForm();
*
* You can also add custom extensions to the form factory:
*
- *
- * $formFactory = Forms::createFormFactoryBuilder()
- * ->addExtension(new AcmeExtension())
- * ->getFormFactory();
- *
+ * $formFactory = Forms::createFormFactoryBuilder()
+ * ->addExtension(new AcmeExtension())
+ * ->getFormFactory();
*
* If you create custom form types or type extensions, it is
* generally recommended to create your own extensions that lazily
@@ -48,54 +44,46 @@ use Symfony\Component\Form\Extension\Core\CoreExtension;
* does not matter that much, you can also pass them directly to the
* form factory:
*
- *
- * $formFactory = Forms::createFormFactoryBuilder()
- * ->addType(new PersonType())
- * ->addType(new PhoneNumberType())
- * ->addTypeExtension(new FormTypeHelpTextExtension())
- * ->getFormFactory();
- *
+ * $formFactory = Forms::createFormFactoryBuilder()
+ * ->addType(new PersonType())
+ * ->addType(new PhoneNumberType())
+ * ->addTypeExtension(new FormTypeHelpTextExtension())
+ * ->getFormFactory();
*
* Support for the Validator component is provided by ValidatorExtension.
* This extension needs a validator object to function properly:
*
- *
- * use Symfony\Component\Validator\Validation;
- * use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
+ * use Symfony\Component\Validator\Validation;
+ * use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
*
- * $validator = Validation::createValidator();
- * $formFactory = Forms::createFormFactoryBuilder()
- * ->addExtension(new ValidatorExtension($validator))
- * ->getFormFactory();
- *
+ * $validator = Validation::createValidator();
+ * $formFactory = Forms::createFormFactoryBuilder()
+ * ->addExtension(new ValidatorExtension($validator))
+ * ->getFormFactory();
*
* Support for the Templating component is provided by TemplatingExtension.
* This extension needs a PhpEngine object for rendering forms. As second
* argument you should pass the names of the default themes. Here is an
* example for using the default layout with "
- * use Symfony\Component\Form\Extension\Templating\TemplatingExtension;
+ * use Symfony\Component\Form\Extension\Templating\TemplatingExtension;
*
- * $formFactory = Forms::createFormFactoryBuilder()
- * ->addExtension(new TemplatingExtension($engine, null, array(
- * 'FrameworkBundle:Form',
- * )))
- * ->getFormFactory();
- *
+ * $formFactory = Forms::createFormFactoryBuilder()
+ * ->addExtension(new TemplatingExtension($engine, null, array(
+ * 'FrameworkBundle:Form',
+ * )))
+ * ->getFormFactory();
*
* The next example shows how to include the "