diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2020-12-30 22:00:22 +0300 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2021-01-05 15:27:36 +0300 |
| commit | b375416ab8b27762f5b6b1b47b6fd78f2cada35a (patch) | |
| tree | af1be916812f66a81cf3a2b1415463015867bfb0 /justinrainbow | |
| parent | 2462d1b72f5b04f8e04f4b17b2cf5a3ccf7ba19b (diff) | |
Update all the things for Guzzle 7
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'justinrainbow')
| -rw-r--r-- | justinrainbow/json-schema/.gitattributes | 5 | ||||
| -rw-r--r-- | justinrainbow/json-schema/composer.json | 4 | ||||
| -rw-r--r-- | justinrainbow/json-schema/src/JsonSchema/Constraints/UndefinedConstraint.php | 6 |
3 files changed, 5 insertions, 10 deletions
diff --git a/justinrainbow/json-schema/.gitattributes b/justinrainbow/json-schema/.gitattributes deleted file mode 100644 index beeff5b8..00000000 --- a/justinrainbow/json-schema/.gitattributes +++ /dev/null @@ -1,5 +0,0 @@ -/docs export-ignore -/tests export-ignore -.gitignore export-ignore -.travis.yml export-ignore -phpunit.dist.xml export-ignore diff --git a/justinrainbow/json-schema/composer.json b/justinrainbow/json-schema/composer.json index 884a6971..fcacd40c 100644 --- a/justinrainbow/json-schema/composer.json +++ b/justinrainbow/json-schema/composer.json @@ -31,7 +31,7 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", - "json-schema/JSON-Schema-Test-Suite": "1.2.0", + "json-schema/json-schema-test-suite": "1.2.0", "phpunit/phpunit": "^4.8.35" }, "extra": { @@ -53,7 +53,7 @@ { "type": "package", "package": { - "name": "json-schema/JSON-Schema-Test-Suite", + "name": "json-schema/json-schema-test-suite", "version": "1.2.0", "source": { "type": "git", diff --git a/justinrainbow/json-schema/src/JsonSchema/Constraints/UndefinedConstraint.php b/justinrainbow/json-schema/src/JsonSchema/Constraints/UndefinedConstraint.php index e194cb0e..8effd4ba 100644 --- a/justinrainbow/json-schema/src/JsonSchema/Constraints/UndefinedConstraint.php +++ b/justinrainbow/json-schema/src/JsonSchema/Constraints/UndefinedConstraint.php @@ -59,7 +59,7 @@ class UndefinedConstraint extends Constraint * @param JsonPointer $path * @param string $i */ - public function validateTypes(&$value, $schema = null, JsonPointer $path, $i = null) + public function validateTypes(&$value, $schema, JsonPointer $path, $i = null) { // check array if ($this->getTypeCheck()->isArray($value)) { @@ -105,7 +105,7 @@ class UndefinedConstraint extends Constraint * @param JsonPointer $path * @param string $i */ - protected function validateCommonProperties(&$value, $schema = null, JsonPointer $path, $i = '') + protected function validateCommonProperties(&$value, $schema, JsonPointer $path, $i = '') { // if it extends another schema, it must pass that schema as well if (isset($schema->extends)) { @@ -151,7 +151,7 @@ class UndefinedConstraint extends Constraint ); } } else { - // If the value is both undefined and not required, skip remaining checks + // if the value is both undefined and not required, skip remaining checks // in this method which assume an actual, defined instance when validating. if ($value instanceof self) { return; |