Merge branch 'develop' into Eole_Graph

Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html

1 files changed, 0 insertions, 70 deletions

diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/JsonPathTest.php b/server/vendor/php-opencloud/common/tests/unit/Common/JsonPathTest.php
deleted file mode 100644
index 1410076..0000000
--- a/server/vendor/php-opencloud/common/tests/unit/Common/JsonPathTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace OpenCloud\Test\Common;
-
-use OpenCloud\Common\JsonPath;
-
-class JsonPathTest extends \PHPUnit_Framework_TestCase
-{
-    private $jsonPath;
-
-    public function setUp()
-    {
-        $this->jsonPath = new JsonPath([]);
-    }
-
-    public function test_it_sets_values_according_to_paths()
-    {
-        $this->jsonPath->set('foo.bar.baz', 'VALUE');
-
-        $expected = [
-            'foo' => [
-                'bar' => [
-                    'baz' => 'VALUE',
-                ]
-            ]
-        ];
-
-        $this->assertEquals($expected, $this->jsonPath->getStructure());
-    }
-
-    public function test_it_sets_arrays_according_to_paths()
-    {
-        $jsonPath = new JsonPath([
-            'foo' => [
-                'bar' => [
-                    'value' => 'VALUE',
-                ]
-            ]
-        ]);
-
-        $jsonPath->set('foo.bar.items', ['item_1', 'item_2']);
-
-        $expected = [
-            'foo' => [
-                'bar' => [
-                    'value' => 'VALUE',
-                    'items' => ['item_1', 'item_2'],
-                ]
-            ]
-        ];
-
-        $this->assertEquals($expected, $jsonPath->getStructure());
-    }
-
-    public function test_it_gets_values_according_to_paths()
-    {
-        $jsonPath = new JsonPath([
-            'foo' => [
-                'bar' => [
-                    'baz' => 'VALUE_1',
-                    'lol' => 'VALUE_2',
-                ]
-            ]
-        ]);
-
-        $this->assertEquals('VALUE_1', $jsonPath->get('foo.bar.baz'));
-        $this->assertEquals('VALUE_2', $jsonPath->get('foo.bar.lol'));
-        $this->assertNull($jsonPath->get('foo.bar.boo'));
-    }
-}