Fix Exception messages for ObjectIdentity ObjectIdentityInterface doesn't require implementing __toString method, so we need to make sure that object can be converted to string.

Sergey Kolodyazhnyy · fabpot · commit 5f3be0e7cbe4 · 2014-03-25T17:45:52.000+01:00
diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
@@ -194,7 +194,8 @@ public function findAcls(array $oids, array $sids = array())
         foreach ($oids as $oid) {
             if (!$result->contains($oid)) {
                 if (1 === count($oids)) {
-                    throw new AclNotFoundException(sprintf('No ACL found for %s.', $oid));
+                    $objectName = method_exists($oid, '__toString') ? $oid : get_class($oid);
+                    throw new AclNotFoundException(sprintf('No ACL found for %s.', $objectName));
                 }
 
                 $partialResultException = new NotAllAclsFoundException('The provider could not find ACLs for all object identities.');
@@ -283,7 +284,8 @@ protected function getAncestorLookupSql(array $batch)
         if (1 === count($types)) {
             $ids = array();
             for ($i = 0; $i < $count; $i++) {
-                $ids[] = $this->connection->quote($batch[$i]->getIdentifier());
+                $identifier = (string) $batch[$i]->getIdentifier();
+                $ids[] = $this->connection->quote($identifier);
             }
 
             $sql .= sprintf(
@@ -325,17 +327,17 @@ protected function getFindChildrenSql(ObjectIdentityInterface $oid, $directChild
             $query = <<<FINDCHILDREN
                 SELECT o.object_identifier, c.class_type
                 FROM
-                    {$this->options['oid_table_name']} as o
-                INNER JOIN {$this->options['class_table_name']} as c ON c.id = o.class_id
-                INNER JOIN {$this->options['oid_ancestors_table_name']} as a ON a.object_identity_id = o.id
+                    {$this->options['oid_table_name']} o
+                INNER JOIN {$this->options['class_table_name']} c ON c.id = o.class_id
+                INNER JOIN {$this->options['oid_ancestors_table_name']} a ON a.object_identity_id = o.id
                 WHERE
                     a.ancestor_id = %d AND a.object_identity_id != a.ancestor_id
 FINDCHILDREN;
         } else {
             $query = <<<FINDCHILDREN
                 SELECT o.object_identifier, c.class_type
-                FROM {$this->options['oid_table_name']} as o
-                INNER JOIN {$this->options['class_table_name']} as c ON c.id = o.class_id
+                FROM {$this->options['oid_table_name']} o
+                INNER JOIN {$this->options['class_table_name']} c ON c.id = o.class_id
                 WHERE o.parent_object_identity_id = %d
 FINDCHILDREN;
         }
@@ -363,8 +365,8 @@ protected function getSelectObjectIdentityIdSql(ObjectIdentityInterface $oid)
             $query,
             $this->options['oid_table_name'],
             $this->options['class_table_name'],
-            $this->connection->quote($oid->getIdentifier()),
-            $this->connection->quote($oid->getType())
+            $this->connection->quote((string) $oid->getIdentifier()),
+            $this->connection->quote((string) $oid->getType())
         );
     }
 
@@ -419,8 +421,8 @@ private function getAncestorIds(array $batch)
         $ancestorIds = array();
         foreach ($this->connection->executeQuery($sql)->fetchAll() as $data) {
             // FIXME: skip ancestors which are cached
-
-            $ancestorIds[] = $data['ancestor_id'];
+            // Fix: Oracle returns keys in uppercase
+            $ancestorIds[] = reset($data);
         }
 
         return $ancestorIds;
@@ -524,7 +526,7 @@ private function hydrateObjectIdentities(Statement $stmt, array $oidLookup, arra
                  $auditSuccess,
                  $auditFailure,
                  $username,
-                 $securityIdentifier) = $data;
+                 $securityIdentifier) = array_values($data);
 
             // has the ACL been hydrated during this hydration cycle?
             if (isset($acls[$aclId])) {
diff --git a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
@@ -51,7 +51,8 @@ public function __construct(Connection $connection, PermissionGrantingStrategyIn
     public function createAcl(ObjectIdentityInterface $oid)
     {
         if (false !== $this->retrieveObjectIdentityPrimaryKey($oid)) {
-            throw new AclAlreadyExistsException(sprintf('%s is already associated with an ACL.', $oid));
+            $objectName = method_exists($oid, '__toString') ? $oid : get_class($oid);
+            throw new AclAlreadyExistsException(sprintf('%s is already associated with an ACL.', $objectName));
         }
 
         $this->connection->beginTransaction();

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,8 @@ public function __construct(Connection $connection, PermissionGrantingStrategyIn`
`51`	`51`	`public function createAcl(ObjectIdentityInterface $oid)`
`52`	`52`	`{`
`53`	`53`	`if (false !== $this->retrieveObjectIdentityPrimaryKey($oid)) {`
`54`		`- throw new AclAlreadyExistsException(sprintf('%s is already associated with an ACL.', $oid));`
	`54`	`+ $objectName = method_exists($oid, '__toString') ? $oid : get_class($oid);`
	`55`	`+ throw new AclAlreadyExistsException(sprintf('%s is already associated with an ACL.', $objectName));`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`$this->connection->beginTransaction();`