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

diff --git a/server/vendor/php-opencloud/common/src/Common/HydratorStrategyTrait.php b/server/vendor/php-opencloud/common/src/Common/HydratorStrategyTrait.php
deleted file mode 100644
index 4995747..0000000
--- a/server/vendor/php-opencloud/common/src/Common/HydratorStrategyTrait.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace OpenCloud\Common;
-
-/**
- * Represents common functionality for populating, or "hydrating", an object with arbitrary data.
- *
- * @package OpenCloud\Common
- */
-trait HydratorStrategyTrait
-{
-    /**
-     * Hydrates an object with set data
-     *
-     * @param array $data    The data to set
-     * @param array $aliases Any aliases
-     */
-    private function hydrate(array $data, array $aliases = [])
-    {
-        foreach ($data as $key => $val) {
-            $key = isset($aliases[$key]) ? $aliases[$key] : $key;
-            if (property_exists($this, $key)) {
-                $this->$key = $val;
-            }
-        }
-    }
-
-    private function set($key, $property, array $data, callable $fn = null)
-    {
-        if (isset($data[$key]) && property_exists($this, $property)) {
-            $value = $fn ? call_user_func($fn, $data[$key]) : $data[$key];
-            $this->$property = $value;
-        }
-    }
-}