Merge remote-tracking branch 'origin/develop' into develop

Author: cdujeu

core/src/plugins/meta.git/composer.json

@@ -0,0 +1,13 @@
+{
+  "name" : "meta.git",
+  "autoload": {
+    "psr-4": {
+      "Pydio\\Access\\Meta\\Version\\" : "./src"
+    }
+  },
+  "require": {
+    "pear/versioncontrol_git": "dev-master"
+
+  }
+
+}

core/src/plugins/meta.git/manifest.xml

@@ -5,7 +5,7 @@
         <core_relation packaged="true" tested_version="4.2.0"/>
         <plugin_author>Charles du Jeu</plugin_author>
     </plugin_info>
-    <class_definition classname="Pydio\Access\Meta\Version\GitManager" filename="plugins/meta.git/GitManager.php"/>
+    <class_definition classname="Pydio\Access\Meta\Version\GitManager" filename="plugins/meta.git/vendor/autoload.php"/>
     <client_settings>
         <resources>
             <i18n namespace="meta.git" path="plugins/meta.git/i18n"/>

core/src/plugins/meta.git/GitManager.php renamed to core/src/plugins/meta.git/src/GitManager.php

@@ -42,14 +42,6 @@ class GitManager extends AbstractMetaSource
 
     private $repoBase;
 
-    public function performChecks()
-    {
-        $ex = ApplicationState::searchIncludePath("VersionControl/Git.php");
-        if (!$ex) {
-            throw new \Exception("Cannot find PEAR library VersionControl/Git");
-        }
-    }
-
     /**
      * @param ContextInterface $ctx
      * @param AbstractAccessDriver $accessDriver
@@ -58,7 +50,6 @@ public function performChecks()
     public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
     {
         parent::initMeta($ctx, $accessDriver);
-        require_once("VersionControl/Git.php");
         $repo = $ctx->getRepository();
         $this->repoBase = $repo->getContextOption($ctx, "PATH");
         if(empty($this->repoBase)){