Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Hidden fields triggering error when using getSingleScalarResult() #8340

Merged
merged 8 commits into from
Dec 6, 2020
Merged

Fix Hidden fields triggering error when using getSingleScalarResult() #8340

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8f384e5
Fix Hidden fields triggering error when using getSingleScalarResult()
Mediagone Nov 13, 2020
74256fd
Fix Coding Standards (7.4)
Mediagone Nov 13, 2020
d0214fe
Fix Coding Standards (7.4) #2
Mediagone Nov 13, 2020
a5c3195
Fix Coding Standards (7.4) - Fix whitespaces
Mediagone Nov 13, 2020
166d031
Fix Coding Standards (7.4) - Fix whitespaces in tests
Mediagone Nov 13, 2020
335385b
Fix Coding Standards (7.4) - Fix more things
Mediagone Nov 13, 2020
7f6846b
Refactor tests into separate methods
Mediagone Nov 26, 2020
1409cb7
Fix Coding Standards (7.4) - Equals sign not aligned with surrounding…
Mediagone Nov 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix Coding Standards (7.4) - Fix more things
  • Loading branch information
@Mediagone
Mediagone committed Nov 13, 2020
commit 335385bb883d9005bd6e362c1a72309e8672637e
10 changes: 4 additions & 6 deletions tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static function singleScalarResultSetProvider(): array
*/
public function testHydrateSingleScalar($name, $resultSet)
{
$rsm = new ResultSetMapping;
$rsm = new ResultSetMapping();
$rsm->addEntityResult(CmsUser::class, 'u');
$rsm->addFieldResult('u', 'u__id', 'id');
$rsm->addFieldResult('u', 'u__name', 'name');
Expand Down Expand Up @@ -124,21 +124,20 @@ public static function singleScalarResultSetWithHiddenFieldProvider() : array
}

/**
*
* @dataProvider singleScalarResultSetWithHiddenFieldProvider
*/
public function testHydrateSingleScalarWithHiddenField($name, $resultSet)
Mediagone marked this conversation as resolved.
Show resolved Hide resolved
{
$rsm = new ResultSetMapping;
$rsm = new ResultSetMapping();
$rsm->addScalarResult('u__id', 'id', 'string');

$stmt = new HydratorMockStatement($resultSet);
$stmt = new HydratorMockStatement($resultSet);
$hydrator = new SingleScalarHydrator($this->_em);

if ($name === 'result1') {
$result = $hydrator->hydrateAll($stmt, $rsm);
$this->assertEquals('1', $result);

return;
}

Expand All @@ -156,5 +155,4 @@ public function testHydrateSingleScalarWithHiddenField($name, $resultSet)
return;
}
}

}