Skip to content

Commit

Permalink
Merge pull request schmittjoh#1183 from open-source-contributions/fix…
Browse files Browse the repository at this point in the history
…_travis_tests

Fix travis tests
  • Loading branch information
goetas authored Apr 4, 2020
2 parents cb3a11d + 8dabe4a commit c9cb427
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sensio.sphinx.refinclude', 'sensio.sphinx.configurationblock', 'sensio.sphinx.phpcode']
extensions = ['sensio.sphinx.configurationblock', 'sensio.sphinx.phpcode']

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
Expand Down
2 changes: 1 addition & 1 deletion tests/Exclusion/GroupsExclusionStrategyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function testGroupsFor(array $groups, array $propsVisited, array $resulti
}

$groupsFor = $exclusion->getGroupsFor($context);
$this->assertEquals($groupsFor, $resultingGroups);
self::assertEquals($groupsFor, $resultingGroups);
}

public function getGroupsFor()
Expand Down
2 changes: 1 addition & 1 deletion tests/Metadata/ExpressionPropertyMetadataTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ public function testSerialization()
$this->setNonDefaultMetadataValues($meta);

$restoredMeta = unserialize(serialize($meta));
$this->assertEquals($meta, $restoredMeta);
self::assertEquals($meta, $restoredMeta);
}
}
2 changes: 1 addition & 1 deletion tests/Metadata/PropertyMetadataTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ public function testSerialization()
$meta->readOnly = true;

$restoredMeta = unserialize(serialize($meta));
$this->assertEquals($meta, $restoredMeta);
self::assertEquals($meta, $restoredMeta);
}
}
2 changes: 1 addition & 1 deletion tests/Metadata/StaticPropertyMetadataTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ public function testSerialization()
$this->setNonDefaultMetadataValues($meta);

$restoredMeta = unserialize(serialize($meta));
$this->assertEquals($meta, $restoredMeta);
self::assertEquals($meta, $restoredMeta);
}
}
2 changes: 1 addition & 1 deletion tests/Metadata/VirtualPropertyMetadataTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ public function testSerialization()
$this->setNonDefaultMetadataValues($meta);

$restoredMeta = unserialize(serialize($meta));
$this->assertEquals($meta, $restoredMeta);
self::assertEquals($meta, $restoredMeta);
}
}
14 changes: 7 additions & 7 deletions tests/Serializer/BaseSerializationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -454,10 +454,10 @@ public function testSimpleInternalObject()

$obj = new SimpleInternalObject('foo', 'bar');

$this->assertEquals($this->getContent('simple_object'), $this->serialize($obj));
self::assertEquals($this->getContent('simple_object'), $this->serialize($obj));

if ($this->hasDeserializer()) {
$this->assertEquals($obj, $this->deserialize($this->getContent('simple_object'), get_class($obj)));
self::assertEquals($obj, $this->deserialize($this->getContent('simple_object'), get_class($obj)));
}
}

Expand All @@ -472,10 +472,10 @@ public function testSimpleObject()

public function testSimpleObjectStaticProp()
{
$this->assertEquals($this->getContent('simple_object'), $this->serialize($obj = new SimpleObjectWithStaticProp('foo', 'bar')));
self::assertEquals($this->getContent('simple_object'), $this->serialize($obj = new SimpleObjectWithStaticProp('foo', 'bar')));

if ($this->hasDeserializer()) {
$this->assertEquals($obj, $this->deserialize($this->getContent('simple_object'), get_class($obj)));
self::assertEquals($obj, $this->deserialize($this->getContent('simple_object'), get_class($obj)));
}
}

Expand Down Expand Up @@ -1567,15 +1567,15 @@ public function testHandlerInvokedOnPrimitives()
GraphNavigatorInterface::DIRECTION_SERIALIZATION,
'Virtual',
$this->getFormat(),
function ($visitor, $data) use (&$invoked) {
static function ($visitor, $data) use (&$invoked) {
$invoked = true;
$this->assertEquals('foo', $data);
self::assertEquals('foo', $data);
return null;
}
);

$this->serializer->serialize('foo', $this->getFormat(), null, 'Virtual');
$this->assertTrue($invoked);
self::assertTrue($invoked);
}

public function getFirstClassListCollectionsValues()
Expand Down
2 changes: 1 addition & 1 deletion tests/Serializer/Doctrine/ObjectConstructorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public function testNamingForIdentifierColumnIsConsidered()
/** @var Server $serverDeserialized */
$serverDeserialized = $serializer->deserialize($jsonData, Server::class, 'json');

static::assertSame(
self::assertSame(
$em->getUnitOfWork()->getEntityState($serverDeserialized),
UnitOfWork::STATE_MANAGED
);
Expand Down

0 comments on commit c9cb427

Please sign in to comment.