Merge pull request #1 from curiosity26/develop

Add cast support of Postgres.

Author: curiosity26

.idea/php.xml

@@ -5,14 +5,17 @@
  * Date: 11/2/18
  * Time: 2:00 PM
  */
+
 namespace Curiosity26\AclHelperBundle\DependencyInjection;
 
+use Oro\ORM\Query\AST\Functions\Cast;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 
-class Curiosity26AclHelperExtension extends Extension
+class Curiosity26AclHelperExtension extends Extension implements PrependExtensionInterface
 {
     /**
      * @param array $configs
@@ -26,4 +29,18 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.yaml');
     }
 
+    public function prepend(ContainerBuilder $container)
+    {
+        $configs = $container->getExtensionConfig('doctrine');
+
+        if (!empty($configs) && array_key_exists('orm', $configs[0])) {
+            $config                                                                         = $configs[0];
+            $default                                                                        = array_key_exists(
+                'default_entity_manager',
+                $config['orm']
+            ) ? $config['orm']['default_entity_manager'] : 'default';
+            $config['orm']['entity_managers'][$default]['dql']['string_functions']['cast'] = Cast::class;
+            $container->prependExtensionConfig('doctrine', $config);
+        }
+    }
 }

DependencyInjection/Curiosity26AclHelperExtension.php

@@ -58,4 +58,12 @@ public function createAclManager()
     {
         return new AclManager($this->aclProvider);
     }
+
+    /**
+     * @return MutableAclProviderInterface
+     */
+    public function getAclProvider(): MutableAclProviderInterface
+    {
+        return $this->aclProvider;
+    }
 }

Helper/AclHelper.php

@@ -12,6 +12,8 @@
 use Curiosity26\AclHelperBundle\Entity\Entry;
 use Curiosity26\AclHelperBundle\Entity\ObjectIdentity;
 use Curiosity26\AclHelperBundle\Entity\SecurityIdentity;
+use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
@@ -77,6 +79,7 @@ public function createAclQueryBuilder(
      * @param string $strategy
      *
      * @return QueryBuilder
+     * @throws \Doctrine\DBAL\DBALException
      */
     public function buildAclQuery($strategy = PermissionGrantingStrategy::ANY)
     {
@@ -99,8 +102,15 @@ public function buildAclQuery($strategy = PermissionGrantingStrategy::ANY)
                 $expr->add($q->expr()->neq('BIT_AND(acl_e.mask, :mask)', 0));
         }
 
+        $platform = $manager->getConnection()->getDatabasePlatform();
+
+        if ($platform instanceof PostgreSqlPlatform) {
+            $q->select('CAST(acl_o.objectIdentifier as int)');
+        } else {
+            $q->select('acl_o.objectIdentifier');
+        }
+
         $q
-            ->select('acl_o.objectIdentifier')
             ->distinct()
             ->from(ObjectIdentity::class, 'acl_o')
             ->innerJoin(AclClass::class, 'acl_c', Join::WITH, 'acl_c.id = acl_o.classId')

QueryBuilder/AclHelperQueryBuilder.php

@@ -8,7 +8,8 @@
         "symfony/acl-bundle": "^1.0",
         "doctrine/doctrine-bundle": "^1.9",
         "doctrine/orm": "^2.6",
-        "symfony/class-loader": "^3.4"
+        "symfony/class-loader": "^3.4",
+        "oro/doctrine-extensions": "^1.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.4",