Style correction and fix to existing test.

doctrine · Nov 2, 2015 · 3a827f3 · 3a827f3
1 parent 79c476c
commit 3a827f3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/lib/Doctrine/ODM/PHPCR/Tools/Helper/UniqueNodeTypeHelper.php b/lib/Doctrine/ODM/PHPCR/Tools/Helper/UniqueNodeTypeHelper.php
@@ -57,14 +57,12 @@ public static function checkNodeTypeMappings(DocumentManagerInterface $documentM
             $knownNodeTypes[$classMetadata->getNodeType()] = $classMetadata->name;
 
             if (!is_null($output)) {
-
                 $output->writeln(sprintf(
                     'The document <info>%s</info> uses %snode type <info>%s</info>',
                     $classMetadata->name,
                     $classMetadata->hasUniqueNodeType() ? '<comment>uniquely mapped</comment> ' : '',
                     $classMetadata->getNodeType()
                 ));
-
             }
         }
     }

diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Functional/QueryBuilderTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Functional/QueryBuilderTest.php
@@ -176,7 +176,7 @@ public function testComposite()
 
         switch ($qb->getQuery()->getLanguage()) {
             case 'JCR-SQL2':
-                $query = "SELECT a.* FROM [nt:unstructured] AS a WHERE ((a.username = 'dtl' OR a.username = 'js') AND (a.[phpcr:class] = 'Doctrine\Tests\Models\Blog\User' OR a.[phpcr:classparents] = 'Doctrine\Tests\Models\Blog\User'))";
+                $query = "SELECT a.* FROM [nt:unstructured] AS a WHERE ((a.[username] = 'dtl' OR a.[username] = 'js') AND (a.[phpcr:class] = 'Doctrine\Tests\Models\Blog\User' OR a.[phpcr:classparents] = 'Doctrine\Tests\Models\Blog\User'))";
                 break;
             case 'sql':
                 $query = "SELECT s FROM nt:unstructured AS a WHERE (a.username = 'dtl' OR a,username = 'js')";
@@ -193,7 +193,7 @@ public function testComposite()
 
         switch ($qb->getQuery()->getLanguage()) {
             case 'JCR-SQL2':
-                $query = "SELECT a.* FROM [nt:unstructured] AS a WHERE (((a.username = 'dtl' OR a.username = 'js') AND a.name = 'foobar') AND (a.[phpcr:class] = 'Doctrine\Tests\Models\Blog\User' OR a.[phpcr:classparents] = 'Doctrine\Tests\Models\Blog\User'))";
+                $query = "SELECT a.* FROM [nt:unstructured] AS a WHERE (((a.[username] = 'dtl' OR a.[username] = 'js') AND a.[name] = 'foobar') AND (a.[phpcr:class] = 'Doctrine\Tests\Models\Blog\User' OR a.[phpcr:classparents] = 'Doctrine\Tests\Models\Blog\User'))";
                 break;
             case 'sql':
                 $this->markTestIncomplete('Not testing SQL for sql query language');
@@ -212,7 +212,7 @@ public function testComposite()
 
         switch ($qb->getQuery()->getLanguage()) {
             case 'JCR-SQL2':
-                $query = "SELECT a.* FROM [nt:unstructured] AS a WHERE ((((a.username = 'dtl' OR a.username = 'js') AND a.name = 'foobar') OR a.name = 'johnsmith') AND (a.[phpcr:class] = 'Doctrine\Tests\Models\Blog\User' OR a.[phpcr:classparents] = 'Doctrine\Tests\Models\Blog\User'))";
+                $query = "SELECT a.* FROM [nt:unstructured] AS a WHERE ((((a.[username] = 'dtl' OR a.[username] = 'js') AND a.[name] = 'foobar') OR a.[name] = 'johnsmith') AND (a.[phpcr:class] = 'Doctrine\Tests\Models\Blog\User' OR a.[phpcr:classparents] = 'Doctrine\Tests\Models\Blog\User'))";
                 break;
             case 'sql':
                 $this->markTestIncomplete('Not testing SQL for sql query language');

diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Tools/Helper/UniqueNodeTypeHelperTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Tools/Helper/UniqueNodeTypeHelperTest.php
@@ -95,4 +95,4 @@ public function testCheckNodeTypeMappingsWithoutDuplicate()
 
         UniqueNodeTypeHelper::checkNodeTypeMappings($documentManager);
     }
-}
+}