Skip to content

Commit

Permalink
Merge pull request #25 from ergebnis/fix/merge
Browse files Browse the repository at this point in the history 
Fix: Merge tests
  • Loading branch information
@localheinz
localheinz committed Mar 10, 2020
2 parents 1b5ca29 + d037597 commit c8d5caf
Show file tree
Hide file tree
Showing 12 changed files with 640 additions and 935 deletions.
9 changes: 2 additions & 7 deletions phpstan-baseline.neon
View file
Expand Up @@ -345,18 +345,13 @@ parameters:
count: 1
path: test/Integration/FixtureFactoryTest.php

-
message: "#^Anonymous function should have native return typehint \"string\"\\.$#"
count: 1
path: test/Unit/BasicUsageTest.php

-
message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) with 'OutOfRangeException' and Ergebnis\\\\FactoryBot\\\\EntityDefinitionUnavailable will always evaluate to true\\.$#"
count: 1
path: test/Unit/EntityDefinitionUnavailableTest.php

-
message: "#^Anonymous function should have native return typehint \"string\"\\.$#"
count: 1
path: test/Unit/SequenceTest.php
count: 2
path: test/Unit/FixtureFactoryTest.php

124 changes: 44 additions & 80 deletions psalm-baseline.xml
View file
Expand Up @@ -199,12 +199,23 @@
<code>getId</code>
</MixedMethodCall>
</file>
<file src="test/Unit/BasicUsageTest.php">
<file src="test/Unit/Definition/DefinitionsTest.php">
<MixedAssignment occurrences="1">
<code>$definitions</code>
</MixedAssignment>
</file>
<file src="test/Unit/FixtureFactoryTest.php">
<DocblockTypeContradiction occurrences="1">
<code>assertEmpty</code>
</DocblockTypeContradiction>
<MissingClosureParamType occurrences="1">
<code>$n</code>
</MissingClosureParamType>
<MixedArgument occurrences="2">
<code>$fixtureFactory-&gt;getList(Fixture\Entity\SpaceShip::class)</code>
<code>$fixtureFactory-&gt;getList(Fixture\Entity\SpaceShip::class, [], 5)</code>
</MixedArgument>
<MixedAssignment occurrences="8">
<MixedAssignment occurrences="23">
<code>$ss</code>
<code>$ss</code>
<code>$ss</code>
Expand All @@ -213,8 +224,23 @@
<code>$p1</code>
<code>$p2</code>
<code>$ship</code>
<code>$person</code>
<code>$ship</code>
<code>$person</code>
<code>$ss</code>
<code>$ss</code>
<code>$ship</code>
<code>$p1</code>
<code>$p2</code>
<code>$ss</code>
<code>$ss</code>
<code>$ss1</code>
<code>$ss2</code>
<code>$badge</code>
<code>$badge1</code>
<code>$badge2</code>
</MixedAssignment>
<MixedMethodCall occurrences="14">
<MixedMethodCall occurrences="47">
<code>getName</code>
<code>getName</code>
<code>getName</code>
Expand All @@ -229,69 +255,27 @@
<code>getCrew</code>
<code>contains</code>
<code>getName</code>
</MixedMethodCall>
</file>
<file src="test/Unit/BidirectionalReferencesTest.php">
<MixedAssignment occurrences="5">
<code>$person</code>
<code>$ship</code>
<code>$ship</code>
<code>$p1</code>
<code>$p2</code>
</MixedAssignment>
<MixedMethodCall occurrences="5">
<code>getSpaceShip</code>
<code>getCrew</code>
<code>getOwner</code>
<code>getSpaceShip</code>
<code>getName</code>
<code>getName</code>
<code>getCrew</code>
<code>getCrew</code>
</MixedMethodCall>
</file>
<file src="test/Unit/Definition/DefinitionsTest.php">
<MixedAssignment occurrences="1">
<code>$definitions</code>
</MixedAssignment>
</file>
<file src="test/Unit/ExtraConfigurationTest.php">
<MixedAssignment occurrences="2">
<code>$ss</code>
<code>$ss</code>
</MixedAssignment>
<MixedMethodCall occurrences="3">
<code>getName</code>
<code>constructorWasCalled</code>
<code>getName</code>
</MixedMethodCall>
<MixedOperand occurrences="3">
<code>$ss-&gt;getName()</code>
<code>$fieldValues['name']</code>
<code>$fieldValues['name']</code>
</MixedOperand>
</file>
<file src="test/Unit/ReferenceTest.php">
<MixedAssignment occurrences="3">
<code>$ss1</code>
<code>$ss2</code>
<code>$person</code>
</MixedAssignment>
<MixedMethodCall occurrences="3">
<code>getSpaceShip</code>
<code>getSpaceShip</code>
<code>getOwner</code>
<code>getSpaceShip</code>
<code>getOwner</code>
<code>getOwner</code>
<code>getOwner</code>
<code>getSpaceShip</code>
<code>getOwner</code>
<code>getSpaceShip</code>
</MixedMethodCall>
</file>
<file src="test/Unit/ReferencesTest.php">
<DocblockTypeContradiction occurrences="1">
<code>assertEmpty</code>
</DocblockTypeContradiction>
</file>
<file src="test/Unit/SequenceTest.php">
<MissingClosureParamType occurrences="1">
<code>$n</code>
</MissingClosureParamType>
<MixedMethodCall occurrences="12">
<code>getName</code>
<code>getName</code>
<code>getName</code>
<code>getName</code>
<code>getName</code>
Expand All @@ -302,33 +286,13 @@
<code>getName</code>
<code>getName</code>
<code>getName</code>
</MixedMethodCall>
</file>
<file src="test/Unit/SingletonTest.php">
<MixedAssignment occurrences="2">
<code>$ss</code>
<code>$ss</code>
</MixedAssignment>
<MixedMethodCall occurrences="2">
<code>getName</code>
<code>getName</code>
</MixedMethodCall>
</file>
<file src="test/Unit/TransitiveReferencesTest.php">
<MixedAssignment occurrences="3">
<code>$badge</code>
<code>$badge1</code>
<code>$badge2</code>
</MixedAssignment>
<MixedMethodCall occurrences="8">
<code>getOwner</code>
<code>getSpaceShip</code>
<code>getOwner</code>
<code>getOwner</code>
<code>getOwner</code>
<code>getSpaceShip</code>
<code>getOwner</code>
<code>getSpaceShip</code>
</MixedMethodCall>
<MixedOperand occurrences="3">
<code>$ss-&gt;getName()</code>
<code>$fieldValues['name']</code>
<code>$fieldValues['name']</code>
</MixedOperand>
</file>
</files>
188 changes: 0 additions & 188 deletions test/Unit/BasicUsageTest.php
View file

This file was deleted.

0 comments on commit c8d5caf

Please sign in to comment.