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, 52 deletions

diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/HydratorStrategyTraitTes.php b/server/vendor/php-opencloud/common/tests/unit/Common/HydratorStrategyTraitTes.php
deleted file mode 100644
index 6841002..0000000
--- a/server/vendor/php-opencloud/common/tests/unit/Common/HydratorStrategyTraitTes.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace OpenCloud\Test\Common;
-
-use OpenCloud\Common\HydratorStrategyTrait;
-use OpenCloud\Test\TestCase;
-
-class HydratorStrategyTraitTest extends TestCase
-{
-    private $fixture;
-
-    public function setUp()
-    {
-        $this->fixture = new Fixture();
-    }
-
-    public function test_it_hydrates()
-    {
-        $data = ['foo' => 1, 'bar' => 2, 'baz' => 3, 'boo' => 4];
-
-        $this->fixture->hydrate($data);
-
-        $this->assertEquals(1, $this->fixture->foo);
-        $this->assertEquals(2, $this->fixture->getBar());
-        $this->assertEquals(3, $this->fixture->getBaz());
-    }
-
-    public function test_it_hydrates_aliases()
-    {
-        $this->fixture->hydrate(['FOO!' => 1], ['FOO!' => 'foo']);
-
-        $this->assertEquals(1, $this->fixture->foo);
-    }
-}
-
-class Fixture
-{
-    public $foo;
-    protected $bar;
-    private $baz;
-
-    use HydratorStrategyTrait;
-
-    public function getBar()
-    {
-        return $this->bar;
-    }
-    public function getBaz()
-    {
-        return $this->baz;
-    }
-}