Commit8804fe3

committed

Merge branch '2.4' into 2.5

* 2.4: Remove diff info from file. ��eraseCredentials method typo Update doctrine.rst

2 parents1c948c8 +1f12a08 commit8804fe3Copy full SHA for 8804fe3

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -699,7 +699,7 @@ method of the entity manager::`
`699`	`699`	`$em->flush();`
`700`	`700`
`701`	`701`	As you might expect, the ``remove()`` method notifies Doctrine that you'd
`702`		-like to remove the givenentity from the database. The actual ``DELETE`` query,
	`702`	+like to remove the givenobject from the database. The actual ``DELETE`` query,
`703`	`703`	however, isn't actually executed until the ``flush()`` method is called.
`704`	`704`
`705`	`705`	.. _`book-doctrine-queries`:

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ interface forces the class to implement the five following methods:`
`194`	`194`	*:method:`Symfony\\Component\\Security\\Core\\User\\UserInterface::getPassword`
`195`	`195`	*:method:`Symfony\\Component\\Security\\Core\\User\\UserInterface::getSalt`
`196`	`196`	*:method:`Symfony\\Component\\Security\\Core\\User\\UserInterface::getUsername`
`197`		-*:method:`Symfony\\Component\\Security\\Core\\User\\UserInterface::eraseCredential`
	`197`	+*:method:`Symfony\\Component\\Security\\Core\\User\\UserInterface::eraseCredentials`
`198`	`198`
`199`	`199`	For more details on each of these, see:class:`Symfony\\Component\\Security\\Core\\User\\UserInterface`.
`200`	`200`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,7 @@ and compare the IP address against a set of blacklisted IP addresses:`
`49`	`49`	`protected $requestStack;`
`50`	`50`	`private $blacklistedIp;`
`51`	`51`
`52`		`-<<<<<<< HEAD`
`53`	`52`	`public function __construct(RequestStack $requestStack, array $blacklistedIp = array())`
`54`		`-=======`
`55`		`- public function __construct(ContainerInterface $container, array $blacklistedIp = array())`
`56`		`->>>>>>> 2.3`
`57`	`53`	`{`
`58`	`54`	`$this->requestStack = $requestStack;`
`59`	`55`	`$this->blacklistedIp = $blacklistedIp;`

Comments

(0)