Commit9008a37

committed

Merge branch '2.8' into 3.0

2 parentscf21977 +7dfa573 commit9008a37Copy full SHA for 9008a37

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -18,8 +18,7 @@ it has its own excellent `documentation`_.
`18`	`18`	`..note::`
`19`	`19`
`20`	`20`	It's recommended to use the latest stable PHPUnit version, `installed as
`21`		-PHAR`_ (you will have to use version 4.2 or higher to test the Symfony core
`22`		`- code itself).`
	`21`	+PHAR`_.
`23`	`22`
`24`	`23`	`Each test - whether it's a unit test or a functional test - is a PHP class`
`25`	`24`	that should live in the ``tests/`` directory of your application. If you follow

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@`
`5`	`5`	`The Form Component`
`6`	`6`	`==================`
`7`	`7`
`8`		`- The Form component allows you to easily create, process and reuse HTML`
`9`		`- forms.`
	`8`	`+ The Form component allows you to easily create, process and reuse forms.`
`10`	`9`
`11`	`10`	`The Form component is a tool to help you solve the problem of allowing end-users`
`12`	`11`	`to interact with the data and modify the data in your application. And though`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,6 @@ proxy before it has expired, it adds complexity to your caching setup.`
`256`	`256`	.. _`Surrogate-Capability Header`:http://www.w3.org/TR/edge-arch
`257`	`257`	.. _`cache invalidation`:http://tools.ietf.org/html/rfc2616#section-13.10
`258`	`258`	.. _`FOSHttpCacheBundle`:http://foshttpcachebundle.readthedocs.org/
`259`		-.. _`default.vcl`:https://www.varnish-cache.org/trac/browser/bin/varnishd/default.vcl?rev=3.0
`260`		-.. _`builtin.vcl`:https://www.varnish-cache.org/trac/browser/bin/varnishd/builtin.vcl?rev=4.0
	`259`	+.. _`default.vcl`:https://github.com/varnish/Varnish-Cache/blob/3.0/bin/varnishd/default.vcl
	`260`	+.. _`builtin.vcl`:https://github.com/varnish/Varnish-Cache/blob/4.1/bin/varnishd/builtin.vcl
`261`	`261`	.. _`User Context`:http://foshttpcachebundle.readthedocs.org/en/latest/features/user-context.html

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ would look like this::`
`150`	`150`	`/** @var Post $post */`
`151`	`151`	`$post = $subject;`
`152`	`152`
`153`		`- switch($attribute) {`
	`153`	`+ switch($attribute) {`
`154`	`154`	`case self::VIEW:`
`155`	`155`	`return $this->canView($post, $user);`
`156`	`156`	`case self::EDIT:`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ method::`
`101`	`101`	`},`
`102`	`102`	`'group_by' => function($category, $key, $index) {`
`103`	`103`	`// randomly assign things into 2 groups`
`104`		`- return rand(0, 1) == 1 ? 'Group A' : 'Group B'`
	`104`	`+ return rand(0, 1) == 1 ? 'Group A' : 'Group B';`
`105`	`105`	`},`
`106`	`106`	`'preferred_choices' => function($category, $key, $index) {`
`107`	`107`	`return $category->getName() == 'Cat2' \|\| $category->getName() == 'Cat3';`

Comments

(0)