minor symfony#3500 Minimize horizontal scrolling in code blocks (improve readability) (ifdattic)

weaverryan · weaverryan · commit 80a90ba8b5c2 · 2014-02-02T21:29:17.000-06:00
This PR was merged into the 2.3 branch. Discussion ---------- Minimize horizontal scrolling in code blocks (improve readability) | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | 2.3 | Fixed tickets | Commits ------- bfd1584 Minimize horizontal scrolling in code blocks (improve readability)
diff --git a/cookbook/templating/PHP.rst b/cookbook/templating/PHP.rst
@@ -54,7 +54,10 @@ below renders the ``index.html.php`` template::
     // ...
     public function indexAction($name)
     {
-        return $this->render('AcmeHelloBundle:Hello:index.html.php', array('name' => $name));
+        return $this->render(
+            'AcmeHelloBundle:Hello:index.html.php',
+            array('name' => $name)
+        );
     }
 
 You can also use the :doc:`/bundles/SensioFrameworkExtraBundle/annotations/view`
diff --git a/cookbook/validation/custom_constraint.rst b/cookbook/validation/custom_constraint.rst
@@ -65,7 +65,10 @@ The validator class is also simple, and only has one required method ``validate(
         public function validate($value, Constraint $constraint)
         {
             if (!preg_match('/^[a-zA-Za0-9]+$/', $value, $matches)) {
-                $this->context->addViolation($constraint->message, array('%string%' => $value));
+                $this->context->addViolation(
+                    $constraint->message,
+                    array('%string%' => $value)
+                );
             }
         }
     }
@@ -216,7 +219,12 @@ With this, the validator ``validate()`` method gets an object as its first argum
         public function validate($protocol, Constraint $constraint)
         {
             if ($protocol->getFoo() != $protocol->getBar()) {
-                $this->context->addViolationAt('foo', $constraint->message, array(), null);
+                $this->context->addViolationAt(
+                    'foo',
+                    $constraint->message,
+                    array(),
+                    null
+                );
             }
         }
     }

Original file line number	Diff line number	Diff line change
@@ -54,7 +54,10 @@ below renders the ``index.html.php`` template::
`54`	`54`	`// ...`
`55`	`55`	`public function indexAction($name)`
`56`	`56`	`{`
`57`		`- return $this->render('AcmeHelloBundle:Hello:index.html.php', array('name' => $name));`
	`57`	`+ return $this->render(`
	`58`	`+ 'AcmeHelloBundle:Hello:index.html.php',`
	`59`	`+ array('name' => $name)`
	`60`	`+ );`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	You can also use the :doc:`/bundles/SensioFrameworkExtraBundle/annotations/view`
Original file line number	Diff line number	Diff line change
@@ -65,7 +65,10 @@ The validator class is also simple, and only has one required method ``validate(
`65`	`65`	`public function validate($value, Constraint $constraint)`
`66`	`66`	`{`
`67`	`67`	`if (!preg_match('/^[a-zA-Za0-9]+$/', $value, $matches)) {`
`68`		`- $this->context->addViolation($constraint->message, array('%string%' => $value));`
	`68`	`+ $this->context->addViolation(`
	`69`	`+ $constraint->message,`
	`70`	`+ array('%string%' => $value)`
	`71`	`+ );`
`69`	`72`	`}`
`70`	`73`	`}`
`71`	`74`	`}`
@@ -216,7 +219,12 @@ With this, the validator ``validate()`` method gets an object as its first argum
`216`	`219`	`public function validate($protocol, Constraint $constraint)`
`217`	`220`	`{`
`218`	`221`	`if ($protocol->getFoo() != $protocol->getBar()) {`
`219`		`- $this->context->addViolationAt('foo', $constraint->message, array(), null);`
	`222`	`+ $this->context->addViolationAt(`
	`223`	`+ 'foo',`
	`224`	`+ $constraint->message,`
	`225`	`+ array(),`
	`226`	`+ null`
	`227`	`+ );`
`220`	`228`	`}`
`221`	`229`	`}`
`222`	`230`	`}`