minor #12856 [2.5] CS Fixes And Removed Unused Imports (GrahamCampbell)

This PR was merged into the 2.5 branch.

Discussion
----------

[2.5] CS Fixes And Removed Unused Imports

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

##### This pull request fixes some cs issues in symfony 2.5.

I've applied the same set of fixes that I did to the 2.3 branch.

There are far fewer fixes than there were for 2.3, so I've just done them all at once.

Commits
-------

ed4fb54 CS fixes
This commit is contained in:
Fabien Potencier 2014-12-05 12:58:26 +01:00
commit 002595a66b
68 changed files with 204 additions and 204 deletions

View File

@ -93,8 +93,9 @@ class AssetsExtension extends \Twig_Extension
*
* @param string $url The URL that has to be absolute
*
* @return string The absolute URL
* @throws \RuntimeException
*
* @return string The absolute URL
*/
private function ensureUrlIsAbsolute($url)
{

View File

@ -96,8 +96,10 @@ class ConsoleLogger extends AbstractLogger
* Interpolates context values into the message placeholders
*
* @author PHP Framework Interoperability Group
*
* @param string $message
* @param array $context
*
* @return string
*/
private function interpolate($message, array $context)

View File

@ -13,7 +13,6 @@ namespace Symfony\Component\HttpKernel\EventListener;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\KernelEvents;
/**

View File

@ -11,8 +11,6 @@
namespace Symfony\Component\HttpKernel\Tests\Bundle;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionAbsentBundle\ExtensionAbsentBundle;
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand;
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\ExtensionPresentBundle;

View File

@ -114,6 +114,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf
* ACL entries have the CASCADE option on their foreign key so they will also get deleted
*
* @param SecurityIdentityInterface $sid
*
* @throws \InvalidArgumentException
*/
public function deleteSecurityIdentity(SecurityIdentityInterface $sid)
@ -653,7 +654,9 @@ QUERY;
* Constructs the SQL to delete a security identity.
*
* @param SecurityIdentityInterface $sid
*
* @throws \InvalidArgumentException
*
* @return string
*/
protected function getDeleteSecurityIdentityIdSql(SecurityIdentityInterface $sid)
@ -693,6 +696,7 @@ QUERY;
*
* @param UserSecurityIdentity $usid
* @param string $oldUsername
*
* @return string
*/
protected function getUpdateUserSecurityIdentitySql(UserSecurityIdentity $usid, $oldUsername)

View File

@ -11,10 +11,6 @@
namespace Symfony\Component\Validator\Violation;
use Symfony\Component\Translation\TranslatorInterface;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintViolation;
use Symfony\Component\Validator\ConstraintViolationList;
use Symfony\Component\Validator\ExecutionContextInterface;
use Symfony\Component\Validator\Util\PropertyPath;