symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php‎
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Security/CHANGELOG.md‎
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Security/CHANGELOG.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php‎
Lines changed: 6 additions & 6 deletions b/‎src/Symfony/Component/Security/Core/Exception/AccessDeniedException.php‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Security/Http/Firewall/AccessListener.php‎
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Security/Http/Firewall/AccessListener.php‎
Lines changed: 1 addition & 1 deletion
@@ -194,7 +194,7 @@ protected function denyAccessUnlessGranted($attributes, $object = null, $message
         if (!$this->isGranted($attributes, $object)) {
             $exception = $this->createAccessDeniedException($message);
             $exception->setAttributes($attributes);
-            $exception->setObject($object);
+            $exception->setSubject($object);
 
             throw $exception;
         }
 
@@ -4,7 +4,7 @@ CHANGELOG
 3.2.0
 -----
 
- * added `attributes` and `object` with getters/setters to `Symfony\Component\Security\Core\Exception\AccessDeniedException`
+ * added `$attributes` and `$subject` with getters/setters to `Symfony\Component\Security\Core\Exception\AccessDeniedException`
 
 3.0.0
 -----
 
@@ -19,7 +19,7 @@
 class AccessDeniedException extends \RuntimeException
 {
     private $attributes = array();
-    private $object;
+    private $subject;
 
     public function __construct($message = 'Access Denied.', \Exception $previous = null)
     {
@@ -45,16 +45,16 @@ public function setAttributes($attributes)
     /**
      * @return mixed
      */
-    public function getObject()
+    public function getSubject()
     {
-        return $this->object;
+        return $this->subject;
     }
 
     /**
-     * @param mixed $object
+     * @param mixed $subject
      */
-    public function setObject($object)
+    public function setSubject($subject)
     {
-        $this->object = $object;
+        $this->subject = $subject;
     }
 }
@@ -69,7 +69,7 @@ public function handle(GetResponseEvent $event)
         if (!$this->accessDecisionManager->decide($token, $attributes, $request)) {
             $exception = new AccessDeniedException();
             $exception->setAttributes($attributes);
-            $exception->setObject($request);
+            $exception->setSubject($request);
 
             throw $exception;
         }
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ protected function denyAccessUnlessGranted($attributes, $object = null, $message`
`194`	`194`	`if (!$this->isGranted($attributes, $object)) {`
`195`	`195`	`$exception = $this->createAccessDeniedException($message);`
`196`	`196`	`$exception->setAttributes($attributes);`
`197`		`- $exception->setObject($object);`
	`197`	`+ $exception->setSubject($object);`
`198`	`198`
`199`	`199`	`throw $exception;`
`200`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`class AccessDeniedException extends \RuntimeException`
`20`	`20`	`{`
`21`	`21`	`private $attributes = array();`
`22`		`- private $object;`
	`22`	`+ private $subject;`
`23`	`23`
`24`	`24`	`public function __construct($message = 'Access Denied.', \Exception $previous = null)`
`25`	`25`	`{`
`@@ -45,16 +45,16 @@ public function setAttributes($attributes)`
`45`	`45`	`/**`
`46`	`46`	`* @return mixed`
`47`	`47`	`*/`
`48`		`- public function getObject()`
	`48`	`+ public function getSubject()`
`49`	`49`	`{`
`50`		`- return $this->object;`
	`50`	`+ return $this->subject;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
`54`		`- * @param mixed $object`
	`54`	`+ * @param mixed $subject`
`55`	`55`	`*/`
`56`		`- public function setObject($object)`
	`56`	`+ public function setSubject($subject)`
`57`	`57`	`{`
`58`		`- $this->object = $object;`
	`58`	`+ $this->subject = $subject;`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function handle(GetResponseEvent $event)`
`69`	`69`	`if (!$this->accessDecisionManager->decide($token, $attributes, $request)) {`
`70`	`70`	`$exception = new AccessDeniedException();`
`71`	`71`	`$exception->setAttributes($attributes);`
`72`		`- $exception->setObject($request);`
	`72`	`+ $exception->setSubject($request);`
`73`	`73`
`74`	`74`	`throw $exception;`
`75`	`75`	`}`