Merge 9e05ece into 9b3f85b

src/Kunstmaan/AdminBundle/Helper/Security/Acl/AclHelper.php

@@ -147,9 +147,9 @@ public function apply(QueryBuilder $queryBuilder, PermissionDefinition $permissi
     private function getPermittedAclIdsSQLForUser(Query $query)
     {
         $aclConnection = $this->em->getConnection();
-        $databasePrefix = is_file($aclConnection->getDatabase()) ? '' : $aclConnection->getDatabase().'.';
+        $stringQuoteChar = $aclConnection->getDatabasePlatform()->getStringLiteralQuoteCharacter();
         $mask = $query->getHint('acl.mask');
-        $rootEntity = '"' . str_replace('\\', '\\\\', $query->getHint('acl.root.entity')) . '"';
+        $rootEntity = $stringQuoteChar . $query->getHint('acl.root.entity') . $stringQuoteChar;
 
         /* @var $token TokenInterface */
         $token = $this->tokenStorage->getToken();
@@ -166,40 +166,41 @@ private function getPermittedAclIdsSQLForUser(Query $query)
         }
 
         // Security context does not provide anonymous role automatically.
-        $uR = array('"IS_AUTHENTICATED_ANONYMOUSLY"');
+        $uR = array($stringQuoteChar . 'IS_AUTHENTICATED_ANONYMOUSLY' . $stringQuoteChar);
 
         foreach ($userRoles as $role) {
             // The reason we ignore this is because by default FOSUserBundle adds ROLE_USER for every user
             if (is_string($role)) {
                 if ($role !== 'ROLE_USER') {
-                    $uR[] = '"' . $role . '"';
+                    $uR[] = $stringQuoteChar . $role . $stringQuoteChar;
                 }
             } else {
                 // Symfony 3.4 compatibility
                 if ($role->getRole() !== 'ROLE_USER') {
-                    $uR[] = '"' . $role->getRole() . '"';
+                    $uR[] = $stringQuoteChar . $role->getRole() . $stringQuoteChar;
                 }
             }
         }
         $uR = array_unique($uR);
         $inString = implode(' OR s.identifier = ', $uR);
 
         if (\is_object($user)) {
-            $inString .= ' OR s.identifier = "' . str_replace(
-                '\\',
-                '\\\\',
-                \get_class($user)
-            ) . '-' . $user->getUserName() . '"';
+            $inString .= ' OR s.identifier = ' . $stringQuoteChar . get_class($user) . '-' . $user->getUserName() . $stringQuoteChar;
+        }
+
+        $objectIdentifierColumn = 'o.object_identifier';
+        if ($aclConnection->getDatabasePlatform()->getName() === 'postgresql') {
+            $objectIdentifierColumn = 'o.object_identifier::BIGINT';
         }
 
         $selectQuery = <<<SELECTQUERY
-SELECT DISTINCT o.object_identifier as id FROM {$databasePrefix}acl_object_identities as o
-INNER JOIN {$databasePrefix}acl_classes c ON c.id = o.class_id
-LEFT JOIN {$databasePrefix}acl_entries e ON (
+SELECT DISTINCT {$objectIdentifierColumn} as id FROM acl_object_identities as o
+INNER JOIN acl_classes c ON c.id = o.class_id
+LEFT JOIN acl_entries e ON (
     e.class_id = o.class_id AND (e.object_identity_id = o.id
     OR {$aclConnection->getDatabasePlatform()->getIsNullExpression('e.object_identity_id')})
 )
-LEFT JOIN {$databasePrefix}acl_security_identities s ON (
+LEFT JOIN acl_security_identities s ON (
 s.id = e.security_identity_id
 )
 WHERE c.class_type = {$rootEntity}

src/Kunstmaan/AdminBundle/Helper/Security/Acl/AclNativeHelper.php

@@ -67,14 +67,14 @@ public function apply(QueryBuilder $queryBuilder, PermissionDefinition $permissi
         }
 
         $aclConnection = $this->em->getConnection();
+        $stringQuoteChar = $aclConnection->getDatabasePlatform()->getStringLiteralQuoteCharacter();
 
-        $databasePrefix = is_file($aclConnection->getDatabase()) ? '' : $aclConnection->getDatabase().'.';
         $rootEntity = $permissionDef->getEntity();
         $linkAlias = $permissionDef->getAlias();
         // Only tables with a single ID PK are currently supported
         $linkField = $this->em->getClassMetadata($rootEntity)->getSingleIdentifierColumnName();
 
-        $rootEntity = '"' . str_replace('\\', '\\\\', $rootEntity) . '"';
+        $rootEntity = $stringQuoteChar . $rootEntity . $stringQuoteChar;
         $query = $queryBuilder;
 
         $builder = new MaskBuilder();
@@ -99,40 +99,41 @@ public function apply(QueryBuilder $queryBuilder, PermissionDefinition $permissi
         }
 
         // Security context does not provide anonymous role automatically.
-        $uR = array('"IS_AUTHENTICATED_ANONYMOUSLY"');
+        $uR = array($stringQuoteChar . 'IS_AUTHENTICATED_ANONYMOUSLY' . $stringQuoteChar);
 
         foreach ($userRoles as $role) {
             // The reason we ignore this is because by default FOSUserBundle adds ROLE_USER for every user
             if (is_string($role)) {
                 if ($role !== 'ROLE_USER') {
-                    $uR[] = '"' . $role . '"';
+                    $uR[] = $stringQuoteChar . $role . $stringQuoteChar;
                 }
             } else {
                 // Symfony 3.4 compatibility
                 if ($role->getRole() !== 'ROLE_USER') {
-                    $uR[] = '"' . $role->getRole() . '"';
+                    $uR[] = $stringQuoteChar . $role->getRole() . $stringQuoteChar;
                 }
             }
         }
         $uR = array_unique($uR);
         $inString = implode(' OR s.identifier = ', $uR);
 
         if (\is_object($user)) {
-            $inString .= ' OR s.identifier = "' . str_replace(
-                '\\',
-                '\\\\',
-                \get_class($user)
-            ) . '-' . $user->getUserName() . '"';
+            $inString .= ' OR s.identifier = ' . $stringQuoteChar . \get_class($user) . '-' . $user->getUserName() . $stringQuoteChar;
+        }
+
+        $objectIdentifierColumn = 'o.object_identifier';
+        if ($aclConnection->getDatabasePlatform()->getName() === 'postgresql') {
+            $objectIdentifierColumn = 'o.object_identifier::BIGINT';
         }
 
         $joinTableQuery = <<<SELECTQUERY
-SELECT DISTINCT o.object_identifier as id FROM {$databasePrefix}acl_object_identities as o
-INNER JOIN {$databasePrefix}acl_classes c ON c.id = o.class_id
-LEFT JOIN {$databasePrefix}acl_entries e ON (
+SELECT DISTINCT {$objectIdentifierColumn} as id FROM acl_object_identities as o
+INNER JOIN acl_classes c ON c.id = o.class_id
+LEFT JOIN acl_entries e ON (
     e.class_id = o.class_id AND (e.object_identity_id = o.id
     OR {$aclConnection->getDatabasePlatform()->getIsNullExpression('e.object_identity_id')})
 )
-LEFT JOIN {$databasePrefix}acl_security_identities s ON (
+LEFT JOIN acl_security_identities s ON (
 s.id = e.security_identity_id
 )
 WHERE c.class_type = {$rootEntity}

src/Kunstmaan/AdminBundle/Helper/Security/Acl/AclWalker.php

@@ -24,9 +24,19 @@ public function walkFromClause($fromClause)
         $tableAlias = $this->getSQLTableAlias($name, $alias);
         $extraQuery = $this->getQuery()->getHint('acl.extra.query');
 
-        $tempAclView = <<<tempAclView
+        switch ($this->getConnection()->getDatabasePlatform()->getName())
+        {
+            case 'postgresql':
+                $tempAclView = <<<tempAclView
+JOIN ({$extraQuery}) ta_ ON {$tableAlias}.id = ta_.id::integer
+tempAclView;
+                break;
+            default:
+                $tempAclView = <<<tempAclView
 JOIN ({$extraQuery}) ta_ ON {$tableAlias}.id = ta_.id
 tempAclView;
+                break;
+        }
 
         return $sql . ' ' . $tempAclView;
     }

src/Kunstmaan/AdminBundle/Repository/ExceptionRepository.php

@@ -26,8 +26,10 @@ public function markAllAsResolved()
     {
         return $this->createQueryBuilder('e')
             ->update()
-            ->set('e.isResolved', 1)
-            ->where('e.isResolved = 0')
+            ->set('e.isResolved', ':resolved')
+            ->where('e.isResolved = :unresolved')
+            ->setParameter('resolved', true)
+            ->setParameter('unresolved', false)
             ->getQuery()
             ->getSingleScalarResult();
     }
@@ -36,7 +38,8 @@ public function findExceptionStatistics()
     {
         return $this->createQueryBuilder('e')
             ->select('COUNT(e.id) as cp_all, SUM(e.events) as cp_sum')
-            ->where('e.isResolved = 0')
+            ->where('e.isResolved = :isResolved')
+            ->setParameter('isResolved', false)
             ->getQuery()
             ->getOneOrNullResult();
     }

src/Kunstmaan/AdminBundle/Repository/UserRepository.php

@@ -29,8 +29,9 @@ public function getUsersByRole($role)
             ->from('KunstmaanAdminBundle:User', 'u')
             ->innerJoin('u.groups', 'g')
             ->innerJoin('g.roles', 'r')
-            ->where('u.enabled=1')
+            ->where('u.enabled=:enabled')
             ->andWhere('r.role IN (:roles)')
+            ->setParameter('enabled', true)
             ->setParameter('roles', $roles);
 
         return $qb->getQuery()->getResult();

src/Kunstmaan/AdminBundle/Resources/doc/Permissions.md

@@ -128,7 +128,8 @@ public function findAllWithPermission(AclHelper $aclHelper, PermissionDefinition
 {
     $qb = $this->createQueryBuilder('b')
             ->select('b')
-            ->where('b.deleted = 0');
+            ->where('b.deleted = :deleted')
+            ->setParameter('deleted', false);
     $query = $aclHelper->apply($qb, $permissionDef);
 
     return $query->getResult();

src/Kunstmaan/AdminBundle/Tests/unit/Helper/Security/Acl/AclHelperTest.php

@@ -76,7 +76,10 @@ protected function setUp(): void
             ->will($this->returnValue('myDatabase'));
 
         /* @var $platform AbstractPlatform */
-        $platform = $this->getMockForAbstractClass('Doctrine\DBAL\Platforms\AbstractPlatform');
+        $platform = $this->createMock(AbstractPlatform::class);
+        $platform->expects($this->any())
+            ->method('getStringLiteralQuoteCharacter')
+            ->willReturn($this->returnValue('#'));
 
         $conn->expects($this->any())
             ->method('getDatabasePlatform')
@@ -202,9 +205,9 @@ public function testApply()
         $this->assertEquals('n', $query->getHint('acl.entityRootTableDqlAlias'));
 
         $aclQuery = $query->getHint('acl.extra.query');
-        $this->assertStringContainsString('"ROLE_SUBJECT"', $aclQuery);
-        $this->assertStringContainsString('"ROLE_KING"', $aclQuery);
-        $this->assertStringContainsString('"IS_AUTHENTICATED_ANONYMOUSLY"', $aclQuery);
+        $this->assertStringContainsString('#ROLE_SUBJECT#', $aclQuery);
+        $this->assertStringContainsString('#ROLE_KING#', $aclQuery);
+        $this->assertStringContainsString('#IS_AUTHENTICATED_ANONYMOUSLY#', $aclQuery);
         $this->assertStringContainsString('MyUser', $aclQuery);
     }
 
@@ -255,7 +258,7 @@ public function testApplyAnonymous()
         $this->assertEquals('n', $query->getHint('acl.entityRootTableDqlAlias'));
 
         $aclQuery = $query->getHint('acl.extra.query');
-        $this->assertStringContainsString('"IS_AUTHENTICATED_ANONYMOUSLY"', $aclQuery);
+        $this->assertStringContainsString('#IS_AUTHENTICATED_ANONYMOUSLY#', $aclQuery);
     }
 
     public function testGetAllowedEntityIds()

src/Kunstmaan/AdminBundle/Tests/unit/Helper/Security/Acl/AclNativeHelperTest.php

@@ -74,7 +74,10 @@ protected function setUp(): void
             ->will($this->returnValue('myDatabase'));
 
         /* @var $platform AbstractPlatform */
-        $platform = $this->getMockForAbstractClass('Doctrine\DBAL\Platforms\AbstractPlatform');
+        $platform = $this->createMock(AbstractPlatform::class);
+        $platform->expects($this->any())
+            ->method('getStringLiteralQuoteCharacter')
+            ->willReturn($this->returnValue('#'));
 
         $this->conn->expects($this->any())
             ->method('getDatabasePlatform')
@@ -151,9 +154,9 @@ public function testApply()
         $qb = $this->object->apply($queryBuilder, $permissionDef);
         $query = $qb->getSQL();
 
-        $this->assertStringContainsString('"ROLE_SUBJECT"', $query);
-        $this->assertStringContainsString('"ROLE_KING"', $query);
-        $this->assertStringContainsString('"IS_AUTHENTICATED_ANONYMOUSLY"', $query);
+        $this->assertStringContainsString('#ROLE_SUBJECT#', $query);
+        $this->assertStringContainsString('#ROLE_KING#', $query);
+        $this->assertStringContainsString('#IS_AUTHENTICATED_ANONYMOUSLY#', $query);
         $this->assertStringContainsString('MyUser', $query);
     }
 
@@ -191,7 +194,7 @@ public function testApplyAnonymous()
         $qb = $this->object->apply($queryBuilder, $permissionDef);
         $query = $qb->getSQL();
 
-        $this->assertStringContainsString('"IS_AUTHENTICATED_ANONYMOUSLY"', $query);
+        $this->assertStringContainsString('#IS_AUTHENTICATED_ANONYMOUSLY#', $query);
     }
 
     public function testGetTokenStorage()

src/Kunstmaan/AdminBundle/Tests/unit/Helper/Security/Acl/AclWalkerTest.php

@@ -36,7 +36,7 @@ public function testWalker()
         $platform->expects($this->once())->method('appendLockHint')->willReturn($from);
 
         $conn = $this->createMock(Connection::class);
-        $conn->expects($this->once())->method('getDatabasePlatform')->willReturn($platform);
+        $conn->expects($this->any())->method('getDatabasePlatform')->willReturn($platform);
 
         $em = $this->createMock(EntityManager::class);
         $query = $this->createMock(AbstractQuery::class);

src/Kunstmaan/AdminListBundle/AdminList/Configurator/AbstractPageAdminListConfigurator.php

@@ -118,7 +118,8 @@ public function adaptQueryBuilder(QueryBuilder $queryBuilder, array $params = []
             ->select('b.id, b.node_id')
             ->from('kuma_node_translations', 'b')
             ->innerJoin('b', 'kuma_nodes', 'n', 'b.node_id = n.id')
-            ->where('n.deleted = 0')
+            ->where('n.deleted = :deleted')
+            ->setParameter('deleted', false)
             ->andWhere('n.ref_entity_name = :class')
             ->setParameter('class', $this->getPageClass())
             ->addOrderBy('b.updated', 'DESC');

src/Kunstmaan/AdminListBundle/Helper/DoctrineDBALAdapter.php

@@ -69,7 +69,6 @@ public function getNbResults()
             $distinctString = 'DISTINCT ';
         }
         $statement = $query->select('COUNT('. $distinctString . $this->countField.') AS total_results')
-            ->orderBy($this->countField)
             ->setMaxResults(1)
             ->execute();
 

src/Kunstmaan/ArticleBundle/AdminList/AbstractArticlePageAdminListConfigurator.php

@@ -108,7 +108,8 @@ public function adaptQueryBuilder(QueryBuilder $queryBuilder)
         $queryBuilder->innerJoin('b.node', 'n', 'WITH', 'b.node = n.id');
         $queryBuilder->innerJoin('b.nodeVersions', 'nv', 'WITH', 'b.publicNodeVersion = nv.id');
         $queryBuilder->andWhere('b.lang = :lang');
-        $queryBuilder->andWhere('n.deleted = 0');
+        $queryBuilder->andWhere('n.deleted = :deleted');
+        $queryBuilder->setParameter('deleted', false);
         $queryBuilder->andWhere('n.refEntityName = :class');
         $queryBuilder->addOrderBy('b.updated', 'DESC');
         $queryBuilder->setParameter('lang', $this->locale);

src/Kunstmaan/ArticleBundle/Repository/AbstractArticleOverviewPageRepository.php

@@ -18,7 +18,8 @@ public function findActiveOverviewPages()
         ->innerJoin('KunstmaanNodeBundle:NodeVersion', 'v', 'WITH', 'a.id = v.refId')
         ->innerJoin('KunstmaanNodeBundle:NodeTranslation', 't', 'WITH', 't.publicNodeVersion = v.id')
         ->innerJoin('KunstmaanNodeBundle:Node', 'n', 'WITH', 't.node = n.id')
-        ->where('n.deleted = 0')
+        ->where('n.deleted = :deleted')
+        ->setParameter('deleted', false)
         ->andWhere('v.refEntityName = :refname')
         ->setParameter('refname', $this->getEntityName());
 

src/Kunstmaan/GeneratorBundle/Resources/SensioGeneratorBundle/skeleton/article/Repository/PageRepositoryPartial.php.twig

@@ -41,8 +41,10 @@ class {{ entity_class }}PageRepository extends AbstractArticlePageRepository
             ->innerJoin('KunstmaanNodeBundle:NodeVersion', 'v', 'WITH', 'a.id = v.refId')
             ->innerJoin('KunstmaanNodeBundle:NodeTranslation', 't', 'WITH', 't.publicNodeVersion = v.id')
             ->innerJoin('KunstmaanNodeBundle:Node', 'n', 'WITH', 't.node = n.id')
-            ->where('t.online = 1')
-            ->andWhere('n.deleted = 0')
+            ->where('t.online = :online')
+            ->setParameter('online', true)
+            ->andWhere('n.deleted = :deleted')
+            ->setParameter('deleted', false)
             ->andWhere('v.refEntityName = :refname')
             ->orderBy('a.date', 'DESC')
             ->setParameter('refname', "{{ namespace | replace({'\\': '\\\\'}) }}\\Entity\\Pages\\{{ entity_class }}Page");

src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php

@@ -153,7 +153,8 @@ public function adaptQueryBuilder(QueryBuilder $queryBuilder)
     {
         $queryBuilder->andWhere('b.folder = :folder')
             ->setParameter('folder', $this->folder->getId())
-            ->andWhere('b.deleted = 0')
+            ->andWhere('b.deleted = :deleted')
+            ->setParameter('deleted', false)
             ->orderBy('b.updatedAt', 'DESC');
 
         if ($this->request->get('_route') == 'KunstmaanMediaBundle_chooser_show_folder') {

src/Kunstmaan/MenuBundle/Form/MenuItemAdminType.php

@@ -91,10 +91,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     $qb = $er->createQueryBuilder('nt')
                         ->innerJoin('nt.publicNodeVersion', 'nv')
                         ->innerJoin('nt.node', 'n')
-                        ->where('n.deleted = 0')
+                        ->where('n.deleted = :deleted')
+                        ->setParameter('deleted', false)
                         ->andWhere('nt.lang = :lang')
                         ->setParameter('lang', $locale)
-                        ->andWhere('nt.online = 1')
+                        ->andWhere('nt.online = :online')
+                        ->setParameter('online', true)
                         ->orderBy('nt.title', 'ASC');
                     if ($rootNode) {
                         $qb->andWhere('n.lft >= :left')

src/Kunstmaan/MenuBundle/Repository/MenuItemRepository.php

@@ -26,7 +26,8 @@ public function getMenuItemsForLanguage($menuName, $locale)
             ->setParameter('locale', $locale)
             ->andWhere('m.name = :name')
             ->setParameter('name', $menuName)
-            ->andWhere('nt.online = 1 OR mi.type = :url_type')
+            ->andWhere('nt.online = :online OR mi.type = :url_type')
+            ->setParameter('online', true)
             ->setParameter('url_type', BaseMenuItem::TYPE_URL_LINK);
 
         $query = $query->getQuery();

src/Kunstmaan/NodeBundle/AdminList/NodeAdminListConfigurator.php

@@ -243,7 +243,8 @@ public function adaptQueryBuilder(QueryBuilder $queryBuilder)
             ->select('b,n')
             ->innerJoin('b.node', 'n', 'WITH', 'b.node = n.id')
             ->andWhere('b.lang = :lang')
-            ->andWhere('n.deleted = 0')
+            ->andWhere('n.deleted = :deleted')
+            ->setParameter('deleted', false)
             ->addOrderBy('b.updated', 'DESC')
             ->setParameter('lang', $this->locale);
 

src/Kunstmaan/NodeBundle/Form/NodeChoiceType.php

@@ -49,7 +49,8 @@ public function configureOptions(OptionsResolver $resolver)
                     ->innerJoin('nt.publicNodeVersion', 'nv')
                     ->andWhere('nt.online = :online')
                     ->andWhere('nt.lang = :lang')
-                    ->andWhere('n.deleted != 1')
+                    ->andWhere('n.deleted = :deleted')
+                    ->setParameter('deleted', false)
                     ->andWhere('n.refEntityName IN(:refEntityName)')
                     ->setParameter('lang', $options['locale'] ? $options['locale'] : $this->getCurrentLocale())
                     ->setParameter('refEntityName', $options['page_class'])