From 24bb5fefbdf93ce0969b7f56cc46c459ebb82a95 Mon Sep 17 00:00:00 2001 From: EoleDev Date: Thu, 14 Apr 2016 16:24:44 +0200 Subject: Mise a jour et nettoyage depot --- .../common/src/Common/JsonSchema/JsonPatch.php | 117 --------------------- .../common/src/Common/JsonSchema/Schema.php | 75 ------------- 2 files changed, 192 deletions(-) delete mode 100644 server/vendor/php-opencloud/common/src/Common/JsonSchema/JsonPatch.php delete mode 100644 server/vendor/php-opencloud/common/src/Common/JsonSchema/Schema.php (limited to 'server/vendor/php-opencloud/common/src/Common/JsonSchema') diff --git a/server/vendor/php-opencloud/common/src/Common/JsonSchema/JsonPatch.php b/server/vendor/php-opencloud/common/src/Common/JsonSchema/JsonPatch.php deleted file mode 100644 index 74d2a78..0000000 --- a/server/vendor/php-opencloud/common/src/Common/JsonSchema/JsonPatch.php +++ /dev/null @@ -1,117 +0,0 @@ -makeDiff($src, $dest); - } - - public function makeDiff($srcStruct, $desStruct, string $path = ''): array - { - $changes = []; - - if (is_object($srcStruct)) { - $changes = $this->handleObject($srcStruct, $desStruct, $path); - } elseif (is_array($srcStruct)) { - $changes = $this->handleArray($srcStruct, $desStruct, $path); - } elseif ($srcStruct != $desStruct) { - $changes[] = $this->makePatch(self::OP_REPLACE, $path, $desStruct); - } - - return $changes; - } - - protected function handleArray(array $srcStruct, array $desStruct, string $path): array - { - $changes = []; - - if ($diff = $this->arrayDiff($desStruct, $srcStruct)) { - foreach ($diff as $key => $val) { - if (is_object($val)) { - $changes = array_merge($changes, $this->makeDiff($srcStruct[$key], $val, $this->path($path, $key))); - } else { - $op = array_key_exists($key, $srcStruct) && !in_array($srcStruct[$key], $desStruct, true) - ? self::OP_REPLACE : self::OP_ADD; - $changes[] = $this->makePatch($op, $this->path($path, $key), $val); - } - } - } elseif ($srcStruct != $desStruct) { - foreach ($srcStruct as $key => $val) { - if (!in_array($val, $desStruct, true)) { - $changes[] = $this->makePatch(self::OP_REMOVE, $this->path($path, $key)); - } - } - } - - return $changes; - } - - protected function handleObject(\stdClass $srcStruct, \stdClass $desStruct, string $path): array - { - $changes = []; - - if ($this->shouldPartiallyReplace($srcStruct, $desStruct)) { - foreach ($desStruct as $key => $val) { - if (!property_exists($srcStruct, $key)) { - $changes[] = $this->makePatch(self::OP_ADD, $this->path($path, $key), $val); - } elseif ($srcStruct->$key != $val) { - $changes = array_merge($changes, $this->makeDiff($srcStruct->$key, $val, $this->path($path, $key))); - } - } - } elseif ($this->shouldPartiallyReplace($desStruct, $srcStruct)) { - foreach ($srcStruct as $key => $val) { - if (!property_exists($desStruct, $key)) { - $changes[] = $this->makePatch(self::OP_REMOVE, $this->path($path, $key)); - } - } - } - - return $changes; - } - - protected function shouldPartiallyReplace(\stdClass $o1, \stdClass $o2): bool - { - return count(array_diff_key((array) $o1, (array) $o2)) < count($o1); - } - - protected function arrayDiff(array $a1, array $a2): array - { - $result = []; - - foreach ($a1 as $key => $val) { - if (!in_array($val, $a2, true)) { - $result[$key] = $val; - } - } - - return $result; - } - - protected function path(string $root, $path): string - { - $path = (string) $path; - - if ($path === '_empty_') { - $path = ''; - } - - return rtrim($root, '/') . '/' . ltrim($path, '/'); - } - - protected function makePatch(string $op, string $path, $val = null): array - { - switch ($op) { - default: - return ['op' => $op, 'path' => $path, 'value' => $val]; - case self::OP_REMOVE: - return ['op' => $op, 'path' => $path]; - } - } -} diff --git a/server/vendor/php-opencloud/common/src/Common/JsonSchema/Schema.php b/server/vendor/php-opencloud/common/src/Common/JsonSchema/Schema.php deleted file mode 100644 index e1e3f65..0000000 --- a/server/vendor/php-opencloud/common/src/Common/JsonSchema/Schema.php +++ /dev/null @@ -1,75 +0,0 @@ -body = (object) $body; - $this->validator = $validator ?: new Validator(); - } - - public function getPropertyPaths(): array - { - $paths = []; - - foreach ($this->body->properties as $propertyName => $property) { - $paths[] = sprintf("/%s", $propertyName); - } - - return $paths; - } - - public function normalizeObject($subject, array $aliases): \stdClass - { - $out = new \stdClass; - - foreach ($this->body->properties as $propertyName => $property) { - $name = isset($aliases[$propertyName]) ? $aliases[$propertyName] : $propertyName; - if (isset($property->readOnly) && $property->readOnly === true) { - continue; - } elseif (property_exists($subject, $name)) { - $out->$propertyName = $subject->$name; - } elseif (property_exists($subject, $propertyName)) { - $out->$propertyName = $subject->$propertyName; - } - } - - return $out; - } - - public function validate($data) - { - $this->validator->check($data, $this->body); - } - - public function isValid(): bool - { - return $this->validator->isValid(); - } - - public function getErrors(): array - { - return $this->validator->getErrors(); - } - - public function getErrorString(): string - { - $msg = "Provided values do not validate. Errors:\n"; - - foreach ($this->getErrors() as $error) { - $msg .= sprintf("[%s] %s\n", $error['property'], $error['message']); - } - - return $msg; - } -} -- cgit v1.2.3