Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 28 deletions

diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/JsonSchema/JsonPatchTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/JsonSchema/JsonPatchTest.php
deleted file mode 100755
index ee7db9e..0000000
--- a/server/vendor/php-opencloud/common/tests/unit/Common/JsonSchema/JsonPatchTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace OpenCloud\Test\Common\JsonSchema;
-
-use OpenCloud\Common\JsonSchema\JsonPatch;
-use OpenCloud\Test\TestCase;
-
-class JsonPatchTest extends TestCase
-{
-    public function testAll()
-    {
-        $fixtures = json_decode(file_get_contents(__DIR__ . '/Fixtures/jsonPatchTests.json'));
-
-        foreach ($fixtures as $fixture) {
-            if (isset($fixture->disabled) || !isset($fixture->expected)) {
-                continue;
-            }
-
-            $actual = JsonPatch::diff($fixture->doc, $fixture->expected);
-
-            $this->assertEquals(
-                json_encode($fixture->patch, JSON_UNESCAPED_SLASHES),
-                json_encode($actual, JSON_UNESCAPED_SLASHES),
-                isset($fixture->comment) ? sprintf("Failed asserting test: %s\n", $fixture->comment) : ''
-            );
-        }
-    }
-}