Merge branch 'fix/composer' into 'master'

Fix/composer

Ce pull request complète le fichier composer.json et ajouter le fichier composer.lock au dépôt.

Le fichier composer.lock devrait être mis dans le dépôt car cela permet d'être certain que lors d'un déploiement, on se retrouve avec les mêmes versions des dépendances que lors du développement et donc ne pas avoir de mauvaise surprise.
Voir : https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file

See merge request !25

.gitignore

@@ -2,7 +2,6 @@
 admin/.htaccess
 admin/.htpasswd
 admin/logs_studs.txt
-composer.lock
 composer.phar
 framanav
 nav

composer.json

@@ -1,4 +1,12 @@
 {
+    "name": "framasoft/framadate",
+    "description": "Application to facilitate the schedule of events or classic polls",
+    "keywords": "poll",
+    "version": "0.8.0",
+    "license": "CeCILL-B",
+
+    "type": "project",
+
     "require": {
         "adodb/adodb-php": "5.19"
     },

composer.lock

@@ -0,0 +1,63 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "09409801c18d04caaf9f8a4f8c7a67b1",
+    "packages": [
+        {
+            "name": "adodb/adodb-php",
+            "version": "v5.19",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ADOdb/ADOdb.git",
+                "reference": "773bb9b7ccd81b403bf75f7ef476c3f2d7ee04de"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/773bb9b7ccd81b403bf75f7ef476c3f2d7ee04de",
+                "reference": "773bb9b7ccd81b403bf75f7ef476c3f2d7ee04de",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "adodb.inc.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1",
+                " BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "John Lim",
+                    "email": "jlim@natsoft.com",
+                    "role": "Author"
+                },
+                {
+                    "name": "Damien Regad",
+                    "role": "Current maintainer"
+                }
+            ],
+            "description": "ADOdb is a PHP database abstraction layer library",
+            "homepage": "http://adodb.sourceforge.net/",
+            "keywords": [
+                "database"
+            ],
+            "time": "2014-04-23 14:37:03"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "platform": [],
+    "platform-dev": []
+}