From a1b30ac4a403aa59952fc3c6f99de7d381094e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Gomez?= Date: Sat, 14 Dec 2013 12:47:55 +0000 Subject: [PATCH] A few cs fixes --- Command/AclInitCommand.php | 1 - Command/WrappedCommand.php | 1 - Model/Acl/EntryQuery.php | 2 +- Model/Acl/ObjectIdentityQuery.php | 12 ++++++------ Model/Acl/SecurityIdentity.php | 2 +- Security/Acl/Domain/MutableAcl.php | 4 ++-- Security/Acl/MutableAclProvider.php | 4 ++-- Security/User/PropelUserProvider.php | 4 ++-- 8 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Command/AclInitCommand.php b/Command/AclInitCommand.php index e535ba3..1464fe3 100644 --- a/Command/AclInitCommand.php +++ b/Command/AclInitCommand.php @@ -14,7 +14,6 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\Output; -use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\HttpKernel\Bundle\BundleInterface; use Symfony\Component\HttpKernel\KernelInterface; diff --git a/Command/WrappedCommand.php b/Command/WrappedCommand.php index 06ba36a..e751641 100644 --- a/Command/WrappedCommand.php +++ b/Command/WrappedCommand.php @@ -15,7 +15,6 @@ use Propel\Generator\Command\AbstractCommand as BaseCommand; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\HttpKernel\Bundle\Bundle; /** * @author Kévin Gomez diff --git a/Model/Acl/EntryQuery.php b/Model/Acl/EntryQuery.php index 0f6b32f..86f75cb 100644 --- a/Model/Acl/EntryQuery.php +++ b/Model/Acl/EntryQuery.php @@ -29,7 +29,7 @@ class EntryQuery extends BaseEntryQuery * * @param \Symfony\Component\Security\Acl\Model\ObjectIdentityInterface $objectIdentity An ACL related ObjectIdentity. * @param array $securityIdentities A list of SecurityIdentity to filter by. - * @param \ConnectionInterface $con + * @param \ConnectionInterface $con * * @return \PropelObjectCollection */ diff --git a/Model/Acl/ObjectIdentityQuery.php b/Model/Acl/ObjectIdentityQuery.php index 22083d3..953f8a4 100644 --- a/Model/Acl/ObjectIdentityQuery.php +++ b/Model/Acl/ObjectIdentityQuery.php @@ -24,7 +24,7 @@ class ObjectIdentityQuery extends BaseObjectIdentityQuery * Filter by an ObjectIdentity object belonging to the given ACL related ObjectIdentity. * * @param \Symfony\Component\Security\Acl\Model\ObjectIdentityInterface $objectIdentity - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return \Propel\PropelBundle\Model\Acl\ObjectIdentityQuery $this */ @@ -47,7 +47,7 @@ class ObjectIdentityQuery extends BaseObjectIdentityQuery * Return an ObjectIdentity object belonging to the given ACL related ObjectIdentity. * * @param \Symfony\Component\Security\Acl\Model\ObjectIdentityInterface $objectIdentity - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return \Propel\PropelBundle\Model\Acl\ObjectIdentity */ @@ -63,7 +63,7 @@ class ObjectIdentityQuery extends BaseObjectIdentityQuery * Return all children of the given object identity. * * @param \Propel\PropelBundle\Model\Acl\ObjectIdentity $objectIdentity - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return \PropelObjectCollection */ @@ -79,7 +79,7 @@ class ObjectIdentityQuery extends BaseObjectIdentityQuery * Return all children and grand-children of the given object identity. * * @param \Propel\PropelBundle\Model\Acl\ObjectIdentity $objectIdentity - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return \PropelObjectCollection */ @@ -97,8 +97,8 @@ class ObjectIdentityQuery extends BaseObjectIdentityQuery /** * Return all ancestors of the given object identity. * - * @param ObjectIdentity $objectIdentity - * @param ConnectionInterface $con + * @param ObjectIdentity $objectIdentity + * @param ConnectionInterface $con * * @return \PropelObjectCollection */ diff --git a/Model/Acl/SecurityIdentity.php b/Model/Acl/SecurityIdentity.php index 7ceae90..7f5fa00 100644 --- a/Model/Acl/SecurityIdentity.php +++ b/Model/Acl/SecurityIdentity.php @@ -56,7 +56,7 @@ class SecurityIdentity extends BaseSecurityIdentity * @throws \InvalidArgumentException * * @param \Symfony\Component\Security\Acl\Model\SecurityIdentityInterface $aclIdentity - * @param ConnectionInterface $con + * @param ConnectionInterface $con * * @return \Propel\PropelBundle\Model\Acl\SecurityIdentity */ diff --git a/Security/Acl/Domain/MutableAcl.php b/Security/Acl/Domain/MutableAcl.php index 49b3342..f68edd2 100644 --- a/Security/Acl/Domain/MutableAcl.php +++ b/Security/Acl/Domain/MutableAcl.php @@ -57,13 +57,13 @@ class MutableAcl extends Acl implements MutableAclInterface /** * Constructor. * - * @param ObjectCollection $entries + * @param ObjectCollection $entries * @param \Symfony\Component\Security\Acl\Model\ObjectIdentityInterface $objectIdentity * @param \Symfony\Component\Security\Acl\Model\PermissionGrantingStrategyInterface $permissionGrantingStrategy * @param array $loadedSecurityIdentities * @param \Symfony\Component\Security\Acl\Model\AclInterface $parentAcl * @param bool $inherited - * @param ConnectionInterface $con + * @param ConnectionInterface $con */ public function __construct(ObjectCollection $entries, ObjectIdentityInterface $objectIdentity, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $loadedSecurityIdentities = array(), AclInterface $parentAcl = null, $inherited = true, ConnectionInterface $con = null) { diff --git a/Security/Acl/MutableAclProvider.php b/Security/Acl/MutableAclProvider.php index 67cdc17..22c213d 100644 --- a/Security/Acl/MutableAclProvider.php +++ b/Security/Acl/MutableAclProvider.php @@ -51,7 +51,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf * Constructor. * * @param \Symfony\Component\Security\Acl\Model\PermissionGrantingStrategyInterface $permissionGrantingStrategy - * @param ConnectionInterface $connection + * @param ConnectionInterface $connection * @param \Symfony\Component\Security\Acl\Model\AclCacheInterface $cache */ public function __construct(PermissionGrantingStrategyInterface $permissionGrantingStrategy, ConnectionInterface $connection = null, AclCacheInterface $cache = null) @@ -325,7 +325,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf /** * Get an ACL for this provider. * - * @param ObjectCollection $collection + * @param ObjectCollection $collection * @param \Symfony\Component\Security\Acl\Model\ObjectIdentityInterface $objectIdentity * @param array $loadedSecurityIdentities * @param \Symfony\Component\Security\Acl\Model\AclInterface $parentAcl diff --git a/Security/User/PropelUserProvider.php b/Security/User/PropelUserProvider.php index 08afe7a..5766487 100644 --- a/Security/User/PropelUserProvider.php +++ b/Security/User/PropelUserProvider.php @@ -47,8 +47,8 @@ class PropelUserProvider implements UserProviderInterface /** * Default constructor * - * @param string $class The User model class. - * @param string|null $property The property to use to retrieve a user. + * @param string $class The User model class. + * @param string|null $property The property to use to retrieve a user. */ public function __construct($class, $property = null) {