summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2016-06-06 11:38:47 +0200
committerNicolas Grekas <nicolas.grekas@gmail.com>2016-06-06 13:03:51 +0200
commit3d7eddb2727c61df81ba74e641a3f21e63887068 (patch)
treee5543baf9f2cfa26f15ac493a71cc4d4fccc1703
parent1eebd2bd10b38c068aa05aa123201c53def1bc6d (diff)
downloadsymfony-security-3d7eddb2727c61df81ba74e641a3f21e63887068.zip
symfony-security-3d7eddb2727c61df81ba74e641a3f21e63887068.tar.gz
symfony-security-3d7eddb2727c61df81ba74e641a3f21e63887068.tar.bz2
`@throws` annotations should go after `@return`v2.7.14
-rw-r--r--Acl/Dbal/MutableAclProvider.php20
-rw-r--r--Acl/Domain/ObjectIdentity.php4
-rw-r--r--Acl/Model/AclInterface.php4
-rw-r--r--Acl/Model/MutableAclProviderInterface.php4
-rw-r--r--Acl/Permission/MaskBuilder.php4
5 files changed, 18 insertions, 18 deletions
diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php
index 273625a..bd1976f 100644
--- a/Acl/Dbal/MutableAclProvider.php
+++ b/Acl/Dbal/MutableAclProvider.php
@@ -554,9 +554,9 @@ QUERY;
*
* @param SecurityIdentityInterface $sid
*
- * @throws \InvalidArgumentException
- *
* @return string
+ *
+ * @throws \InvalidArgumentException
*/
protected function getInsertSecurityIdentitySql(SecurityIdentityInterface $sid)
{
@@ -626,9 +626,9 @@ QUERY;
*
* @param SecurityIdentityInterface $sid
*
- * @throws \InvalidArgumentException
- *
* @return string
+ *
+ * @throws \InvalidArgumentException
*/
protected function getSelectSecurityIdentityIdSql(SecurityIdentityInterface $sid)
{
@@ -655,9 +655,9 @@ QUERY;
*
* @param SecurityIdentityInterface $sid
*
- * @throws \InvalidArgumentException
- *
* @return string
+ *
+ * @throws \InvalidArgumentException
*/
protected function getDeleteSecurityIdentityIdSql(SecurityIdentityInterface $sid)
{
@@ -673,9 +673,9 @@ QUERY;
* @param int $pk
* @param array $changes
*
- * @throws \InvalidArgumentException
- *
* @return string
+ *
+ * @throws \InvalidArgumentException
*/
protected function getUpdateObjectIdentitySql($pk, array $changes)
{
@@ -723,9 +723,9 @@ QUERY;
* @param int $pk
* @param array $sets
*
- * @throws \InvalidArgumentException
- *
* @return string
+ *
+ * @throws \InvalidArgumentException
*/
protected function getUpdateAccessControlEntrySql($pk, array $sets)
{
diff --git a/Acl/Domain/ObjectIdentity.php b/Acl/Domain/ObjectIdentity.php
index 871bda7..ec817e2 100644
--- a/Acl/Domain/ObjectIdentity.php
+++ b/Acl/Domain/ObjectIdentity.php
@@ -52,9 +52,9 @@ final class ObjectIdentity implements ObjectIdentityInterface
*
* @param object $domainObject
*
- * @throws InvalidDomainObjectException
- *
* @return ObjectIdentity
+ *
+ * @throws InvalidDomainObjectException
*/
public static function fromDomainObject($domainObject)
{
diff --git a/Acl/Model/AclInterface.php b/Acl/Model/AclInterface.php
index 6a70a7c..13a6cf8 100644
--- a/Acl/Model/AclInterface.php
+++ b/Acl/Model/AclInterface.php
@@ -97,9 +97,9 @@ interface AclInterface extends \Serializable
* @param array $securityIdentities
* @param bool $administrativeMode
*
- * @throws NoAceFoundException when no ACE was applicable for this request
- *
* @return bool
+ *
+ * @throws NoAceFoundException when no ACE was applicable for this request
*/
public function isGranted(array $masks, array $securityIdentities, $administrativeMode = false);
diff --git a/Acl/Model/MutableAclProviderInterface.php b/Acl/Model/MutableAclProviderInterface.php
index 95f531e..ee6d7c4 100644
--- a/Acl/Model/MutableAclProviderInterface.php
+++ b/Acl/Model/MutableAclProviderInterface.php
@@ -25,10 +25,10 @@ interface MutableAclProviderInterface extends AclProviderInterface
*
* @param ObjectIdentityInterface $oid
*
+ * @return MutableAclInterface
+ *
* @throws AclAlreadyExistsException when there already is an ACL for the given
* object identity
- *
- * @return MutableAclInterface
*/
public function createAcl(ObjectIdentityInterface $oid);
diff --git a/Acl/Permission/MaskBuilder.php b/Acl/Permission/MaskBuilder.php
index 0b5f388..ed13ecb 100644
--- a/Acl/Permission/MaskBuilder.php
+++ b/Acl/Permission/MaskBuilder.php
@@ -96,10 +96,10 @@ class MaskBuilder extends AbstractMaskBuilder
*
* @param int $mask
*
+ * @return string
+ *
* @throws \InvalidArgumentException
* @throws \RuntimeException
- *
- * @return string
*/
public static function getCode($mask)
{