From ba31d00155eb404547908c522e74856704ff9393 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Wed, 10 Jun 2015 20:30:03 +0200 Subject: [PATCH 1/2] Standardize the name of the exception variables --- src/Symfony/Bundle/TwigBundle/TwigEngine.php | 2 +- .../Component/Config/Definition/ArrayNode.php | 2 +- .../Component/Config/Definition/BaseNode.php | 12 ++++-------- .../Config/Definition/PrototypedArrayNode.php | 2 +- .../Compiler/ResolveInvalidReferencesPass.php | 4 ++-- .../DataCollector/RequestDataCollector.php | 2 +- .../ContainerAwareHttpKernelTest.php | 8 ++++---- .../Component/Security/Acl/Dbal/AclProvider.php | 4 ++-- .../Security/Acl/Dbal/MutableAclProvider.php | 12 ++++++------ .../Security/Acl/Domain/ObjectIdentity.php | 4 ++-- .../Domain/ObjectIdentityRetrievalStrategy.php | 2 +- .../Acl/Domain/PermissionGrantingStrategy.php | 16 ++++++++-------- .../Domain/SecurityIdentityRetrievalStrategy.php | 2 +- .../Security/Acl/Permission/MaskBuilder.php | 2 +- .../Component/Security/Acl/Voter/AclVoter.php | 4 ++-- .../Provider/DaoAuthenticationProvider.php | 14 +++++++------- .../Provider/UserAuthenticationProvider.php | 8 ++++---- .../Security/Core/User/ChainUserProvider.php | 12 ++++++------ .../AbstractPreAuthenticatedListener.php | 8 ++++---- .../Firewall/BasicAuthenticationListener.php | 6 +++--- .../Security/Http/Firewall/ContextListener.php | 6 +++--- .../Firewall/DigestAuthenticationListener.php | 2 +- .../Http/Firewall/RememberMeListener.php | 4 ++-- .../RememberMe/AbstractRememberMeServices.php | 12 ++++++------ .../RememberMe/TokenBasedRememberMeServices.php | 8 ++++---- .../Security/Tests/Acl/Dbal/AclProviderTest.php | 8 ++++---- .../Tests/Acl/Dbal/MutableAclProviderTest.php | 6 +++--- .../Domain/PermissionGrantingStrategyTest.php | 2 +- ...ersistentTokenBasedRememberMeServicesTest.php | 2 +- 29 files changed, 86 insertions(+), 90 deletions(-) diff --git a/src/Symfony/Bundle/TwigBundle/TwigEngine.php b/src/Symfony/Bundle/TwigBundle/TwigEngine.php index c6f8a09a353ec..927256a20cb39 100644 --- a/src/Symfony/Bundle/TwigBundle/TwigEngine.php +++ b/src/Symfony/Bundle/TwigBundle/TwigEngine.php @@ -79,7 +79,7 @@ public function render($name, array $parameters = array()) try { // try to get the real file name of the template where the error occurred $e->setTemplateFile(sprintf('%s', $this->locator->locate($this->parser->parse($e->getTemplateFile())))); - } catch (\Exception $ex) { + } catch (\Exception $e2) { } } diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php index 2bb9a7e9e7eea..4513922576890 100644 --- a/src/Symfony/Component/Config/Definition/ArrayNode.php +++ b/src/Symfony/Component/Config/Definition/ArrayNode.php @@ -256,7 +256,7 @@ protected function finalizeValue($value) try { $value[$name] = $child->finalize($value[$name]); - } catch (UnsetKeyException $unset) { + } catch (UnsetKeyException $e) { unset($value[$name]); } } diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php index 732e08626107f..ad84d012a64ba 100644 --- a/src/Symfony/Component/Config/Definition/BaseNode.php +++ b/src/Symfony/Component/Config/Definition/BaseNode.php @@ -302,14 +302,10 @@ final public function finalize($value) foreach ($this->finalValidationClosures as $closure) { try { $value = $closure($value); - } catch (Exception $correctEx) { - throw $correctEx; - } catch (\Exception $invalid) { - throw new InvalidConfigurationException(sprintf( - 'Invalid configuration for path "%s": %s', - $this->getPath(), - $invalid->getMessage() - ), $invalid->getCode(), $invalid); + } catch (Exception $e) { + throw $e; + } catch (\Exception $e) { + throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": %s', $this->getPath(), $e->getMessage()), $e->getCode(), $e); } } diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php index b1fbc36167547..f0930db9f637a 100644 --- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php +++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php @@ -211,7 +211,7 @@ protected function finalizeValue($value) $this->prototype->setName($k); try { $value[$k] = $this->prototype->finalize($v); - } catch (UnsetKeyException $unset) { + } catch (UnsetKeyException $e) { unset($value[$k]); } } diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php index 000bf087001c7..85dbceb9a61ec 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php @@ -47,7 +47,7 @@ public function process(ContainerBuilder $container) foreach ($definition->getMethodCalls() as $call) { try { $calls[] = array($call[0], $this->processArguments($call[1], true)); - } catch (RuntimeException $ignore) { + } catch (RuntimeException $e) { // this call is simply removed } } @@ -58,7 +58,7 @@ public function process(ContainerBuilder $container) try { $value = $this->processArguments(array($value), true); $properties[$name] = reset($value); - } catch (RuntimeException $ignore) { + } catch (RuntimeException $e) { // ignore property } } diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php index 49f252a81c682..5cc3b7d154bd7 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php @@ -125,7 +125,7 @@ public function collect(Request $request, Response $response, \Exception $except 'file' => $r->getFileName(), 'line' => $r->getStartLine(), ); - } catch (\ReflectionException $re) { + } catch (\ReflectionException $e) { if (is_callable($controller)) { // using __call or __callStatic $this->data['controller'] = array( diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php index 28901dafdd643..f015857b730e9 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ContainerAwareHttpKernelTest.php @@ -137,10 +137,10 @@ public function testHandleRestoresThePreviousRequestOnException($type) try { $kernel->handle($request, $type); $this->fail('->handle() suppresses the controller exception'); - } catch (\PHPUnit_Framework_Exception $exception) { - throw $exception; - } catch (\Exception $actual) { - $this->assertSame($expected, $actual, '->handle() throws the controller exception'); + } catch (\PHPUnit_Framework_Exception $e) { + throw $e; + } catch (\Exception $e) { + $this->assertSame($expected, $e, '->handle() throws the controller exception'); } } diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php index 7c512adc7c868..1fade3b4b2938 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php +++ b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php @@ -177,13 +177,13 @@ public function findAcls(array $oids, array $sids = array()) if ($currentBatchesCount > 0 && (self::MAX_BATCH_SIZE === $currentBatchesCount || ($i + 1) === $c)) { try { $loadedBatch = $this->lookupObjectIdentities($currentBatch, $sids, $oidLookup); - } catch (AclNotFoundException $aclNotFoundexception) { + } catch (AclNotFoundException $e) { if ($result->count()) { $partialResultException = new NotAllAclsFoundException('The provider could not find ACLs for all object identities.'); $partialResultException->setPartialResult($result); throw $partialResultException; } else { - throw $aclNotFoundexception; + throw $e; } } foreach ($loadedBatch as $loadedOid) { diff --git a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php index 30772b46bf81b..c62bdd4176419 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php +++ b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php @@ -62,10 +62,10 @@ public function createAcl(ObjectIdentityInterface $oid) $this->connection->executeQuery($this->getInsertObjectIdentityRelationSql($pk, $pk)); $this->connection->commit(); - } catch (\Exception $failed) { + } catch (\Exception $e) { $this->connection->rollBack(); - throw $failed; + throw $e; } // re-read the ACL from the database to ensure proper caching, etc. @@ -90,10 +90,10 @@ public function deleteAcl(ObjectIdentityInterface $oid) $this->deleteObjectIdentity($oidPK); $this->connection->commit(); - } catch (\Exception $failed) { + } catch (\Exception $e) { $this->connection->rollBack(); - throw $failed; + throw $e; } // evict the ACL from the in-memory identity map @@ -324,10 +324,10 @@ public function updateAcl(MutableAclInterface $acl) } $this->connection->commit(); - } catch (\Exception $failed) { + } catch (\Exception $e) { $this->connection->rollBack(); - throw $failed; + throw $e; } $this->propertyChanges->offsetSet($acl, array()); diff --git a/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php b/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php index fc5b9c6de66d2..871bda7b10970 100644 --- a/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php +++ b/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php @@ -68,8 +68,8 @@ public static function fromDomainObject($domainObject) } elseif (method_exists($domainObject, 'getId')) { return new self((string) $domainObject->getId(), ClassUtils::getRealClass($domainObject)); } - } catch (\InvalidArgumentException $invalid) { - throw new InvalidDomainObjectException($invalid->getMessage(), 0, $invalid); + } catch (\InvalidArgumentException $e) { + throw new InvalidDomainObjectException($e->getMessage(), 0, $e); } throw new InvalidDomainObjectException('$domainObject must either implement the DomainObjectInterface, or have a method named "getId".'); diff --git a/src/Symfony/Component/Security/Acl/Domain/ObjectIdentityRetrievalStrategy.php b/src/Symfony/Component/Security/Acl/Domain/ObjectIdentityRetrievalStrategy.php index 21ac8121fb111..80de6e028406a 100644 --- a/src/Symfony/Component/Security/Acl/Domain/ObjectIdentityRetrievalStrategy.php +++ b/src/Symfony/Component/Security/Acl/Domain/ObjectIdentityRetrievalStrategy.php @@ -28,7 +28,7 @@ public function getObjectIdentity($domainObject) { try { return ObjectIdentity::fromDomainObject($domainObject); - } catch (InvalidDomainObjectException $failed) { + } catch (InvalidDomainObjectException $e) { return; } } diff --git a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php index ef80a2036c9a9..742c4e5fbfcc8 100644 --- a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php +++ b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php @@ -55,21 +55,21 @@ public function isGranted(AclInterface $acl, array $masks, array $sids, $adminis } return $this->hasSufficientPermissions($acl, $aces, $masks, $sids, $administrativeMode); - } catch (NoAceFoundException $noObjectAce) { + } catch (NoAceFoundException $e) { $aces = $acl->getClassAces(); if (!$aces) { - throw $noObjectAce; + throw $e; } return $this->hasSufficientPermissions($acl, $aces, $masks, $sids, $administrativeMode); } - } catch (NoAceFoundException $noClassAce) { + } catch (NoAceFoundException $e) { if ($acl->isEntriesInheriting() && null !== $parentAcl = $acl->getParentAcl()) { return $parentAcl->isGranted($masks, $sids, $administrativeMode); } - throw $noClassAce; + throw $e; } } @@ -86,20 +86,20 @@ public function isFieldGranted(AclInterface $acl, $field, array $masks, array $s } return $this->hasSufficientPermissions($acl, $aces, $masks, $sids, $administrativeMode); - } catch (NoAceFoundException $noObjectAces) { + } catch (NoAceFoundException $e) { $aces = $acl->getClassFieldAces($field); if (!$aces) { - throw $noObjectAces; + throw $e; } return $this->hasSufficientPermissions($acl, $aces, $masks, $sids, $administrativeMode); } - } catch (NoAceFoundException $noClassAces) { + } catch (NoAceFoundException $e) { if ($acl->isEntriesInheriting() && null !== $parentAcl = $acl->getParentAcl()) { return $parentAcl->isFieldGranted($field, $masks, $sids, $administrativeMode); } - throw $noClassAces; + throw $e; } } diff --git a/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php b/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php index 708c633af8049..a08f67e295515 100644 --- a/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php +++ b/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php @@ -51,7 +51,7 @@ public function getSecurityIdentities(TokenInterface $token) if (!$token instanceof AnonymousToken) { try { $sids[] = UserSecurityIdentity::fromToken($token); - } catch (\InvalidArgumentException $invalid) { + } catch (\InvalidArgumentException $e) { // ignore, user has no user security identity } } diff --git a/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php b/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php index 45d89aa710643..ca25c70f069aa 100644 --- a/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php +++ b/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php @@ -132,7 +132,7 @@ public function getPattern() if ('1' === $bitmask[$i]) { try { $pattern[$i] = self::getCode(1 << ($length - $i - 1)); - } catch (\Exception $notPredefined) { + } catch (\Exception $e) { $pattern[$i] = self::ON; } } diff --git a/src/Symfony/Component/Security/Acl/Voter/AclVoter.php b/src/Symfony/Component/Security/Acl/Voter/AclVoter.php index 9657eedb8ddab..4a8533afd6a53 100644 --- a/src/Symfony/Component/Security/Acl/Voter/AclVoter.php +++ b/src/Symfony/Component/Security/Acl/Voter/AclVoter.php @@ -113,13 +113,13 @@ public function vote(TokenInterface $token, $object, array $attributes) } return self::ACCESS_DENIED; - } catch (AclNotFoundException $noAcl) { + } catch (AclNotFoundException $e) { if (null !== $this->logger) { $this->logger->debug('No ACL found for the object identity. Voting to deny access.'); } return self::ACCESS_DENIED; - } catch (NoAceFoundException $noAce) { + } catch (NoAceFoundException $e) { if (null !== $this->logger) { $this->logger->debug('ACL found, no ACE applicable. Voting to deny access.'); } diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php index b7b4917e90153..90cba25d64382 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/DaoAuthenticationProvider.php @@ -87,13 +87,13 @@ protected function retrieveUser($username, UsernamePasswordToken $token) } return $user; - } catch (UsernameNotFoundException $notFound) { - $notFound->setUsername($username); - throw $notFound; - } catch (\Exception $repositoryProblem) { - $ex = new AuthenticationServiceException($repositoryProblem->getMessage(), 0, $repositoryProblem); - $ex->setToken($token); - throw $ex; + } catch (UsernameNotFoundException $e) { + $e->setUsername($username); + throw $e; + } catch (\Exception $e) { + $e = new AuthenticationServiceException($e->getMessage(), 0, $e); + $e->setToken($token); + throw $e; } } } diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php index b9481359a25c5..b65a16bbb2406 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php @@ -68,13 +68,13 @@ public function authenticate(TokenInterface $token) try { $user = $this->retrieveUser($username, $token); - } catch (UsernameNotFoundException $notFound) { + } catch (UsernameNotFoundException $e) { if ($this->hideUserNotFoundExceptions) { - throw new BadCredentialsException('Bad credentials', 0, $notFound); + throw new BadCredentialsException('Bad credentials', 0, $e); } - $notFound->setUsername($username); + $e->setUsername($username); - throw $notFound; + throw $e; } if (!$user instanceof UserInterface) { diff --git a/src/Symfony/Component/Security/Core/User/ChainUserProvider.php b/src/Symfony/Component/Security/Core/User/ChainUserProvider.php index 6e14a4ff26ad0..8604ddc4a7391 100644 --- a/src/Symfony/Component/Security/Core/User/ChainUserProvider.php +++ b/src/Symfony/Component/Security/Core/User/ChainUserProvider.php @@ -47,7 +47,7 @@ public function loadUserByUsername($username) foreach ($this->providers as $provider) { try { return $provider->loadUserByUsername($username); - } catch (UsernameNotFoundException $notFound) { + } catch (UsernameNotFoundException $e) { // try next one } } @@ -67,18 +67,18 @@ public function refreshUser(UserInterface $user) foreach ($this->providers as $provider) { try { return $provider->refreshUser($user); - } catch (UnsupportedUserException $unsupported) { + } catch (UnsupportedUserException $e) { // try next one - } catch (UsernameNotFoundException $notFound) { + } catch (UsernameNotFoundException $e) { $supportedUserFound = true; // try next one } } if ($supportedUserFound) { - $ex = new UsernameNotFoundException(sprintf('There is no user with name "%s".', $user->getUsername())); - $ex->setUsername($user->getUsername()); - throw $ex; + $e = new UsernameNotFoundException(sprintf('There is no user with name "%s".', $user->getUsername())); + $e->setUsername($user->getUsername()); + throw $e; } else { throw new UnsupportedUserException(sprintf('The account "%s" is not supported.', get_class($user))); } diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php index f040107ac1a73..997368348ad7e 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php @@ -62,8 +62,8 @@ final public function handle(GetResponseEvent $event) try { list($user, $credentials) = $this->getPreAuthenticatedData($request); - } catch (BadCredentialsException $exception) { - $this->clearToken($exception); + } catch (BadCredentialsException $e) { + $this->clearToken($e); return; } @@ -90,8 +90,8 @@ final public function handle(GetResponseEvent $event) $loginEvent = new InteractiveLoginEvent($request, $token); $this->dispatcher->dispatch(SecurityEvents::INTERACTIVE_LOGIN, $loginEvent); } - } catch (AuthenticationException $failed) { - $this->clearToken($failed); + } catch (AuthenticationException $e) { + $this->clearToken($e); } } diff --git a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php index bfc4abc83455f..eed9838c400a5 100644 --- a/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php @@ -73,21 +73,21 @@ public function handle(GetResponseEvent $event) try { $token = $this->authenticationManager->authenticate(new UsernamePasswordToken($username, $request->headers->get('PHP_AUTH_PW'), $this->providerKey)); $this->securityContext->setToken($token); - } catch (AuthenticationException $failed) { + } catch (AuthenticationException $e) { $token = $this->securityContext->getToken(); if ($token instanceof UsernamePasswordToken && $this->providerKey === $token->getProviderKey()) { $this->securityContext->setToken(null); } if (null !== $this->logger) { - $this->logger->info(sprintf('Authentication request failed for user "%s": %s', $username, $failed->getMessage())); + $this->logger->info(sprintf('Authentication request failed for user "%s": %s', $username, $e->getMessage())); } if ($this->ignoreFailure) { return; } - $event->setResponse($this->authenticationEntryPoint->start($request, $failed)); + $event->setResponse($this->authenticationEntryPoint->start($request, $e)); } } } diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php index c80fff3317c0e..43ad31d1a1629 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php @@ -167,11 +167,11 @@ private function refreshUser(TokenInterface $token) } return $token; - } catch (UnsupportedUserException $unsupported) { + } catch (UnsupportedUserException $e) { // let's try the next user provider - } catch (UsernameNotFoundException $notFound) { + } catch (UsernameNotFoundException $e) { if (null !== $this->logger) { - $this->logger->warning(sprintf('Username "%s" could not be found.', $notFound->getUsername())); + $this->logger->warning(sprintf('Username "%s" could not be found.', $e->getUsername())); } return; diff --git a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php index 358c3c7a7cc34..27370694d9517 100644 --- a/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php @@ -93,7 +93,7 @@ public function handle(GetResponseEvent $event) } $serverDigestMd5 = $digestAuth->calculateServerDigest($user->getPassword(), $request->getMethod()); - } catch (UsernameNotFoundException $notFound) { + } catch (UsernameNotFoundException $e) { $this->fail($event, $request, new BadCredentialsException(sprintf('Username %s not found.', $digestAuth->getUsername()))); return; diff --git a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php index beacff301c11f..942e53787a1bc 100644 --- a/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php @@ -80,12 +80,12 @@ public function handle(GetResponseEvent $event) if (null !== $this->logger) { $this->logger->debug('SecurityContext populated with remember-me token.'); } - } catch (AuthenticationException $failed) { + } catch (AuthenticationException $e) { if (null !== $this->logger) { $this->logger->warning( 'SecurityContext not populated with remember-me token as the' .' AuthenticationManager rejected the AuthenticationToken returned' - .' by the RememberMeServices: '.$failed->getMessage() + .' by the RememberMeServices: '.$e->getMessage() ); } diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php index 16f7831e7c53b..1ba2df677aa14 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php @@ -123,21 +123,21 @@ final public function autoLogin(Request $request) } return new RememberMeToken($user, $this->providerKey, $this->key); - } catch (CookieTheftException $theft) { + } catch (CookieTheftException $e) { $this->cancelCookie($request); - throw $theft; - } catch (UsernameNotFoundException $notFound) { + throw $e; + } catch (UsernameNotFoundException $e) { if (null !== $this->logger) { $this->logger->info('User for remember-me cookie not found.'); } - } catch (UnsupportedUserException $unSupported) { + } catch (UnsupportedUserException $e) { if (null !== $this->logger) { $this->logger->warning('User class for remember-me cookie not supported.'); } - } catch (AuthenticationException $invalid) { + } catch (AuthenticationException $e) { if (null !== $this->logger) { - $this->logger->debug('Remember-Me authentication failed: '.$invalid->getMessage()); + $this->logger->debug('Remember-Me authentication failed: '.$e->getMessage()); } } diff --git a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php index 89bcb6faf5b79..de662fb3d8b90 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php @@ -41,12 +41,12 @@ protected function processAutoLoginCookie(array $cookieParts, Request $request) } try { $user = $this->getUserProvider($class)->loadUserByUsername($username); - } catch (\Exception $ex) { - if (!$ex instanceof AuthenticationException) { - $ex = new AuthenticationException($ex->getMessage(), $ex->getCode(), $ex); + } catch (\Exception $e) { + if (!$e instanceof AuthenticationException) { + $e = new AuthenticationException($e->getMessage(), $e->getCode(), $e); } - throw $ex; + throw $e; } if (!$user instanceof UserInterface) { diff --git a/src/Symfony/Component/Security/Tests/Acl/Dbal/AclProviderTest.php b/src/Symfony/Component/Security/Tests/Acl/Dbal/AclProviderTest.php index ecd53db122d03..7ca493f70da7a 100644 --- a/src/Symfony/Component/Security/Tests/Acl/Dbal/AclProviderTest.php +++ b/src/Symfony/Component/Security/Tests/Acl/Dbal/AclProviderTest.php @@ -45,11 +45,11 @@ public function testFindAclsThrowsExceptionUnlessAnACLIsFoundForEveryOID() $this->getProvider()->findAcls($oids); $this->fail('Provider did not throw an expected exception.'); - } catch (\Exception $ex) { - $this->assertInstanceOf('Symfony\Component\Security\Acl\Exception\AclNotFoundException', $ex); - $this->assertInstanceOf('Symfony\Component\Security\Acl\Exception\NotAllAclsFoundException', $ex); + } catch (\Exception $e) { + $this->assertInstanceOf('Symfony\Component\Security\Acl\Exception\AclNotFoundException', $e); + $this->assertInstanceOf('Symfony\Component\Security\Acl\Exception\NotAllAclsFoundException', $e); - $partialResult = $ex->getPartialResult(); + $partialResult = $e->getPartialResult(); $this->assertTrue($partialResult->contains($oids[0])); $this->assertFalse($partialResult->contains($oids[1])); } diff --git a/src/Symfony/Component/Security/Tests/Acl/Dbal/MutableAclProviderTest.php b/src/Symfony/Component/Security/Tests/Acl/Dbal/MutableAclProviderTest.php index f6d66ef115486..00500f8779302 100644 --- a/src/Symfony/Component/Security/Tests/Acl/Dbal/MutableAclProviderTest.php +++ b/src/Symfony/Component/Security/Tests/Acl/Dbal/MutableAclProviderTest.php @@ -88,7 +88,7 @@ public function testDeleteAcl() try { $provider->findAcl($oid); $this->fail('ACL has not been properly deleted.'); - } catch (AclNotFoundException $notFound) { + } catch (AclNotFoundException $e) { } } @@ -104,7 +104,7 @@ public function testDeleteAclDeletesChildren() try { $provider->findAcl(new ObjectIdentity(1, 'Foo')); $this->fail('Child-ACLs have not been deleted.'); - } catch (AclNotFoundException $notFound) { + } catch (AclNotFoundException $e) { } } @@ -290,7 +290,7 @@ public function testUpdateAclThrowsExceptionOnConcurrentModificationOfSharedProp try { $provider->updateAcl($acl1); $this->fail('Provider failed to detect a concurrent modification.'); - } catch (ConcurrentModificationException $ex) { + } catch (ConcurrentModificationException $e) { } } diff --git a/src/Symfony/Component/Security/Tests/Acl/Domain/PermissionGrantingStrategyTest.php b/src/Symfony/Component/Security/Tests/Acl/Domain/PermissionGrantingStrategyTest.php index 4935bffe49c6e..fd33f8ddb18ea 100644 --- a/src/Symfony/Component/Security/Tests/Acl/Domain/PermissionGrantingStrategyTest.php +++ b/src/Symfony/Component/Security/Tests/Acl/Domain/PermissionGrantingStrategyTest.php @@ -154,7 +154,7 @@ public function testIsGrantedStrategies($maskStrategy, $aceMask, $requiredMask, try { $strategy->isGranted($acl, array($requiredMask), array($sid)); $this->fail('The ACE is not supposed to match.'); - } catch (NoAceFoundException $noAce) { + } catch (NoAceFoundException $e) { } } else { $this->assertTrue($strategy->isGranted($acl, array($requiredMask), array($sid))); diff --git a/src/Symfony/Component/Security/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/src/Symfony/Component/Security/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php index 19f6984e6fca0..591828f080243 100644 --- a/src/Symfony/Component/Security/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php +++ b/src/Symfony/Component/Security/Tests/Http/RememberMe/PersistentTokenBasedRememberMeServicesTest.php @@ -115,7 +115,7 @@ public function testAutoLoginThrowsExceptionOnStolenCookieAndRemovesItFromThePer try { $service->autoLogin($request); $this->fail('Expected CookieTheftException was not thrown.'); - } catch (CookieTheftException $theft) { + } catch (CookieTheftException $e) { } $this->assertTrue($request->attributes->has(RememberMeServicesInterface::COOKIE_ATTR_NAME)); From 65c98980ebc890f34b71c43f1b38eda87f4a1b68 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Thu, 11 Jun 2015 16:29:03 +0200 Subject: [PATCH 2/2] Updated the name of another exception variable --- src/Symfony/Component/Console/Helper/DialogHelper.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/Console/Helper/DialogHelper.php b/src/Symfony/Component/Console/Helper/DialogHelper.php index d81ec9454f5aa..adbf1869c0239 100644 --- a/src/Symfony/Component/Console/Helper/DialogHelper.php +++ b/src/Symfony/Component/Console/Helper/DialogHelper.php @@ -452,18 +452,18 @@ private function hasSttyAvailable() */ private function validateAttempts($interviewer, OutputInterface $output, $validator, $attempts) { - $error = null; + $e = null; while (false === $attempts || $attempts--) { - if (null !== $error) { - $output->writeln($this->getHelperSet()->get('formatter')->formatBlock($error->getMessage(), 'error')); + if (null !== $e) { + $output->writeln($this->getHelperSet()->get('formatter')->formatBlock($e->getMessage(), 'error')); } try { return call_user_func($validator, $interviewer()); - } catch (\Exception $error) { + } catch (\Exception $e) { } } - throw $error; + throw $e; } } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy