Merge pull request #2 from curiosity26/develop

A better solution to preventing unwanted comparisons

Author: curiosity26

DependencyInjection/Curiosity26AclHelperExtension.php

@@ -8,14 +8,12 @@
 
 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 implements PrependExtensionInterface
+class Curiosity26AclHelperExtension extends Extension
 {
     /**
      * @param array $configs
@@ -28,19 +26,4 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new YamlFileLoader($container, new FileLocator([__DIR__.'/../Resources/config/']));
         $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);
-        }
-    }
 }

QueryBuilder/AclHelperQueryBuilder.php

@@ -89,6 +89,7 @@ public function buildAclQuery($strategy = PermissionGrantingStrategy::ANY)
         $expr = $q->expr()
                   ->andX($q->expr()->eq('acl_c.classType', ':class_type'))
                   ->add($q->expr()->in('acl_s.identifier', ':identities'))
+                  ->add($q->expr()->neq('acl_o.objectIdentifier', "'class'"))
             ;
 
         switch ($strategy) {
@@ -102,15 +103,8 @@ 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')

composer.json

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