Skip to content

Apply fixes from StyleCI #20

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

Merged
merged 1 commit into from
Oct 26, 2018
Merged

Apply fixes from StyleCI #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/Assert.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static function assertJsonMatchesSchema($content, $schema = null)

if ($schema !== null) {
$schemaObject = json_decode(file_get_contents($schema));
self::$schemaStorage->addSchema( 'file://' . $schema, $schemaObject);
self::$schemaStorage->addSchema('file://'.$schema, $schemaObject);
}

$validator = new Validator(new Factory(self::$schemaStorage));
Expand All @@ -78,6 +78,7 @@ public static function assertJsonMatchesSchema($content, $schema = null)
*
* @param string|null $schema Path to the schema file
* @param array|object $content JSON array or object
*
* @deprecated This will be removed in the next major version (4.x).
*/
public static function assertJsonMatchesSchemaDepr($schema, $content)
Expand Down
1 change: 1 addition & 0 deletions tests/AssertTraitImpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public function setUp()
/**
* @param string $id
* @param string $schema
*
* @return SchemaStorage
*/
public function testWithSchemaStore($id, $schema)
Expand Down
4 changes: 2 additions & 2 deletions tests/AssertTraitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ public function testAssertWithSchemaStore()
$obj = new AssertTraitImpl();
$obj->setUp();

$schemastore = $obj->testWithSchemaStore('foobar', (object)['type' => 'string']);
$schemastore = $obj->testWithSchemaStore('foobar', (object) ['type' => 'string']);

self::assertInstanceOf('JsonSchema\SchemaStorage', $schemastore);
self::assertEquals($schemastore->getSchema('foobar'), (object)['type' => 'string']);
self::assertEquals($schemastore->getSchema('foobar'), (object) ['type' => 'string']);
}

public function assertJsonValueEqualsProvider()
Expand Down