--- a/server/src/composer.lock Mon Mar 21 14:04:19 2016 +0100
+++ b/server/src/composer.lock Fri Mar 25 17:03:45 2016 +0100
@@ -528,16 +528,16 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "6.1.1",
+ "version": "6.2.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c"
+ "reference": "d094e337976dff9d8e2424e8485872194e768662"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c",
- "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662",
+ "reference": "d094e337976dff9d8e2424e8485872194e768662",
"shasum": ""
},
"require": {
@@ -553,7 +553,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "6.1-dev"
+ "dev-master": "6.2-dev"
}
},
"autoload": {
@@ -586,20 +586,20 @@
"rest",
"web service"
],
- "time": "2015-11-23 00:47:50"
+ "time": "2016-03-21 20:02:09"
},
{
"name": "guzzlehttp/promises",
- "version": "1.0.3",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea"
+ "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea",
- "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8",
+ "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8",
"shasum": ""
},
"require": {
@@ -637,7 +637,7 @@
"keywords": [
"promise"
],
- "time": "2015-10-15 22:28:00"
+ "time": "2016-03-08 01:15:46"
},
{
"name": "guzzlehttp/psr7",
@@ -844,16 +844,16 @@
},
{
"name": "laravel/framework",
- "version": "v5.2.20",
+ "version": "v5.2.24",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "d4ff9a1e3e9b2f99f8f3e957876e343d804d944f"
+ "reference": "396297a5fd3c70c2fc1af68f09ee574a2380175c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/d4ff9a1e3e9b2f99f8f3e957876e343d804d944f",
- "reference": "d4ff9a1e3e9b2f99f8f3e957876e343d804d944f",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/396297a5fd3c70c2fc1af68f09ee574a2380175c",
+ "reference": "396297a5fd3c70c2fc1af68f09ee574a2380175c",
"shasum": ""
},
"require": {
@@ -866,9 +866,9 @@
"monolog/monolog": "~1.11",
"mtdowling/cron-expression": "~1.0",
"nesbot/carbon": "~1.20",
- "paragonie/random_compat": "~1.1",
+ "paragonie/random_compat": "~1.4",
"php": ">=5.5.9",
- "psy/psysh": "0.6.*",
+ "psy/psysh": "0.7.*",
"swiftmailer/swiftmailer": "~5.1",
"symfony/console": "2.8.*|3.0.*",
"symfony/debug": "2.8.*|3.0.*",
@@ -968,7 +968,7 @@
"framework",
"laravel"
],
- "time": "2016-02-19 17:58:28"
+ "time": "2016-03-22 13:45:19"
},
{
"name": "laravelcollective/html",
@@ -1026,16 +1026,16 @@
},
{
"name": "league/flysystem",
- "version": "1.0.17",
+ "version": "1.0.20",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "02f5b6c9a8b9278c8381e3361e7bd9d641c740ca"
+ "reference": "e87a786e3ae12a25cf78a71bb07b4b384bfaa83a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/02f5b6c9a8b9278c8381e3361e7bd9d641c740ca",
- "reference": "02f5b6c9a8b9278c8381e3361e7bd9d641c740ca",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e87a786e3ae12a25cf78a71bb07b4b384bfaa83a",
+ "reference": "e87a786e3ae12a25cf78a71bb07b4b384bfaa83a",
"shasum": ""
},
"require": {
@@ -1105,7 +1105,7 @@
"sftp",
"storage"
],
- "time": "2016-02-19 15:35:38"
+ "time": "2016-03-14 21:54:11"
},
{
"name": "ml/iri",
@@ -1205,16 +1205,16 @@
},
{
"name": "monolog/monolog",
- "version": "1.17.2",
+ "version": "1.18.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24"
+ "reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24",
- "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a5f2734e8c16f3aa21b3da09715d10e15b4d2d45",
+ "reference": "a5f2734e8c16f3aa21b3da09715d10e15b4d2d45",
"shasum": ""
},
"require": {
@@ -1243,6 +1243,7 @@
"ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
"ext-mongo": "Allow sending log messages to a MongoDB server",
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+ "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
"php-console/php-console": "Allow sending log messages to Google Chrome",
"raven/raven": "Allow sending log messages to a Sentry server",
"rollbar/rollbar": "Allow sending log messages to Rollbar",
@@ -1252,7 +1253,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.16.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -1278,7 +1279,7 @@
"logging",
"psr-3"
],
- "time": "2015-10-14 12:51:02"
+ "time": "2016-03-13 16:08:35"
},
{
"name": "mtdowling/cron-expression",
@@ -1373,16 +1374,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v2.0.0",
+ "version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "c542e5d86a9775abd1021618eb2430278bfc1e01"
+ "reference": "ce5be709d59b32dd8a88c80259028759991a4206"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c542e5d86a9775abd1021618eb2430278bfc1e01",
- "reference": "c542e5d86a9775abd1021618eb2430278bfc1e01",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ce5be709d59b32dd8a88c80259028759991a4206",
+ "reference": "ce5be709d59b32dd8a88c80259028759991a4206",
"shasum": ""
},
"require": {
@@ -1420,20 +1421,20 @@
"parser",
"php"
],
- "time": "2015-12-04 15:28:43"
+ "time": "2016-02-28 19:48:28"
},
{
"name": "paragonie/random_compat",
- "version": "v1.2.0",
+ "version": "v1.4.1",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "b0e69d10852716b2ccbdff69c75c477637220790"
+ "reference": "c7e26a21ba357863de030f0b9e701c7d04593774"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/b0e69d10852716b2ccbdff69c75c477637220790",
- "reference": "b0e69d10852716b2ccbdff69c75c477637220790",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774",
+ "reference": "c7e26a21ba357863de030f0b9e701c7d04593774",
"shasum": ""
},
"require": {
@@ -1468,7 +1469,7 @@
"pseudorandom",
"random"
],
- "time": "2016-02-06 03:52:05"
+ "time": "2016-03-18 20:34:03"
},
{
"name": "pimple/pimple",
@@ -1605,16 +1606,16 @@
},
{
"name": "psy/psysh",
- "version": "v0.6.1",
+ "version": "v0.7.2",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "0f04df0b23663799a8941fae13cd8e6299bde3ed"
+ "reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/0f04df0b23663799a8941fae13cd8e6299bde3ed",
- "reference": "0f04df0b23663799a8941fae13cd8e6299bde3ed",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e64e10b20f8d229cac76399e1f3edddb57a0f280",
+ "reference": "e64e10b20f8d229cac76399e1f3edddb57a0f280",
"shasum": ""
},
"require": {
@@ -1643,7 +1644,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-develop": "0.7.x-dev"
+ "dev-develop": "0.8.x-dev"
}
},
"autoload": {
@@ -1673,7 +1674,7 @@
"interactive",
"shell"
],
- "time": "2015-11-12 16:18:56"
+ "time": "2016-03-09 05:03:14"
},
{
"name": "shift31/laravel-elasticsearch",
@@ -1768,16 +1769,16 @@
},
{
"name": "symfony/console",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "5a02eaadaa285e2bb727eb6bbdfb8201fcd971b0"
+ "reference": "2ed5e2706ce92313d120b8fe50d1063bcfd12e04"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/5a02eaadaa285e2bb727eb6bbdfb8201fcd971b0",
- "reference": "5a02eaadaa285e2bb727eb6bbdfb8201fcd971b0",
+ "url": "https://api.github.com/repos/symfony/console/zipball/2ed5e2706ce92313d120b8fe50d1063bcfd12e04",
+ "reference": "2ed5e2706ce92313d120b8fe50d1063bcfd12e04",
"shasum": ""
},
"require": {
@@ -1824,11 +1825,11 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2016-02-02 13:44:19"
+ "time": "2016-02-28 16:24:34"
},
{
"name": "symfony/debug",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
@@ -1885,7 +1886,7 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -1945,7 +1946,7 @@
},
{
"name": "symfony/finder",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -1994,16 +1995,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "9344a87ceedfc50354a39653e54257ee9aa6a77d"
+ "reference": "52065702c71743c05d415a8facfcad6d4257e8d7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9344a87ceedfc50354a39653e54257ee9aa6a77d",
- "reference": "9344a87ceedfc50354a39653e54257ee9aa6a77d",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/52065702c71743c05d415a8facfcad6d4257e8d7",
+ "reference": "52065702c71743c05d415a8facfcad6d4257e8d7",
"shasum": ""
},
"require": {
@@ -2042,20 +2043,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2016-02-02 13:44:19"
+ "time": "2016-02-28 16:24:34"
},
{
"name": "symfony/http-kernel",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "cec02604450481ac26710ca4249cc61b57b23942"
+ "reference": "59c0a1972e9aad87b7a56bbe1ccee26b7535a0db"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/cec02604450481ac26710ca4249cc61b57b23942",
- "reference": "cec02604450481ac26710ca4249cc61b57b23942",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/59c0a1972e9aad87b7a56bbe1ccee26b7535a0db",
+ "reference": "59c0a1972e9aad87b7a56bbe1ccee26b7535a0db",
"shasum": ""
},
"require": {
@@ -2124,11 +2125,11 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2016-02-03 12:38:44"
+ "time": "2016-02-28 21:33:13"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.1.0",
+ "version": "v1.1.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -2187,7 +2188,7 @@
},
{
"name": "symfony/polyfill-php56",
- "version": "v1.1.0",
+ "version": "v1.1.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
@@ -2243,7 +2244,7 @@
},
{
"name": "symfony/polyfill-util",
- "version": "v1.1.0",
+ "version": "v1.1.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
@@ -2295,7 +2296,7 @@
},
{
"name": "symfony/process",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -2344,16 +2345,16 @@
},
{
"name": "symfony/routing",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "4686baa55a835e1c1ede9b86ba02415c8c8d6166"
+ "reference": "fa1e9a8173cf0077dd995205da453eacd758fdf6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/4686baa55a835e1c1ede9b86ba02415c8c8d6166",
- "reference": "4686baa55a835e1c1ede9b86ba02415c8c8d6166",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/fa1e9a8173cf0077dd995205da453eacd758fdf6",
+ "reference": "fa1e9a8173cf0077dd995205da453eacd758fdf6",
"shasum": ""
},
"require": {
@@ -2376,6 +2377,7 @@
"symfony/config": "For using the all-in-one router or any loader",
"symfony/dependency-injection": "For loading routes from a service",
"symfony/expression-language": "For using expression matching",
+ "symfony/http-foundation": "For using a Symfony Request object",
"symfony/yaml": "For using the YAML loader"
},
"type": "library",
@@ -2414,11 +2416,11 @@
"uri",
"url"
],
- "time": "2016-01-27 05:14:46"
+ "time": "2016-02-04 13:53:13"
},
{
"name": "symfony/translation",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
@@ -2482,16 +2484,16 @@
},
{
"name": "symfony/var-dumper",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "24bb94807eff00db49374c37ebf56a0304e8aef3"
+ "reference": "9a6a883c48acb215d4825ce9de61dccf93d62074"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/24bb94807eff00db49374c37ebf56a0304e8aef3",
- "reference": "24bb94807eff00db49374c37ebf56a0304e8aef3",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9a6a883c48acb215d4825ce9de61dccf93d62074",
+ "reference": "9a6a883c48acb215d4825ce9de61dccf93d62074",
"shasum": ""
},
"require": {
@@ -2541,7 +2543,7 @@
"debug",
"dump"
],
- "time": "2016-01-07 13:38:51"
+ "time": "2016-02-13 09:23:44"
},
{
"name": "vlucas/phpdotenv",
@@ -2652,16 +2654,16 @@
},
{
"name": "fabpot/php-cs-fixer",
- "version": "v1.11.1",
+ "version": "v1.11.2",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "2c9f8298181f059c5077abda78019b9a0c9a7cc0"
+ "reference": "41f70154642ec0f9ea9ea9c290943f3b5dfa76fc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/2c9f8298181f059c5077abda78019b9a0c9a7cc0",
- "reference": "2c9f8298181f059c5077abda78019b9a0c9a7cc0",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/41f70154642ec0f9ea9ea9c290943f3b5dfa76fc",
+ "reference": "41f70154642ec0f9ea9ea9c290943f3b5dfa76fc",
"shasum": ""
},
"require": {
@@ -2702,7 +2704,7 @@
}
],
"description": "A tool to automatically fix PHP code style",
- "time": "2016-01-20 19:00:28"
+ "time": "2016-02-26 07:37:29"
},
{
"name": "fzaninotto/faker",
@@ -2758,7 +2760,7 @@
},
{
"name": "hamcrest/hamcrest-php",
- "version": "dev-master",
+ "version": "v2.0.0",
"source": {
"type": "git",
"url": "https://github.com/hamcrest/hamcrest-php.git",
@@ -2810,12 +2812,12 @@
"source": {
"type": "git",
"url": "https://github.com/padraic/mockery.git",
- "reference": "65ac076184b21fbf064a03051a4b290cca759980"
+ "reference": "e597b2047e5a722dc18d7a629a2964b4ca606441"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/padraic/mockery/zipball/65ac076184b21fbf064a03051a4b290cca759980",
- "reference": "65ac076184b21fbf064a03051a4b290cca759980",
+ "url": "https://api.github.com/repos/padraic/mockery/zipball/e597b2047e5a722dc18d7a629a2964b4ca606441",
+ "reference": "e597b2047e5a722dc18d7a629a2964b4ca606441",
"shasum": ""
},
"require": {
@@ -2867,7 +2869,7 @@
"test double",
"testing"
],
- "time": "2016-02-22 11:01:34"
+ "time": "2016-03-17 19:48:40"
},
{
"name": "myclabs/deep-copy",
@@ -2996,16 +2998,16 @@
},
{
"name": "phpspec/phpspec",
- "version": "2.4.1",
+ "version": "2.5.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/phpspec.git",
- "reference": "5528ce1e93a1efa090c9404aba3395c329b4e6ed"
+ "reference": "385ecb015e97c13818074f1517928b24d4a26067"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/phpspec/zipball/5528ce1e93a1efa090c9404aba3395c329b4e6ed",
- "reference": "5528ce1e93a1efa090c9404aba3395c329b4e6ed",
+ "url": "https://api.github.com/repos/phpspec/phpspec/zipball/385ecb015e97c13818074f1517928b24d4a26067",
+ "reference": "385ecb015e97c13818074f1517928b24d4a26067",
"shasum": ""
},
"require": {
@@ -3070,7 +3072,7 @@
"testing",
"tests"
],
- "time": "2016-01-01 10:17:54"
+ "time": "2016-03-20 20:34:32"
},
{
"name": "phpspec/prophecy",
@@ -3136,16 +3138,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "3.2.1",
+ "version": "3.3.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "a58f95ae76fe201b571fad3e8370a50c4368678c"
+ "reference": "fe33716763b604ade4cb442c0794f5bd5ad73004"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/a58f95ae76fe201b571fad3e8370a50c4368678c",
- "reference": "a58f95ae76fe201b571fad3e8370a50c4368678c",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fe33716763b604ade4cb442c0794f5bd5ad73004",
+ "reference": "fe33716763b604ade4cb442c0794f5bd5ad73004",
"shasum": ""
},
"require": {
@@ -3169,7 +3171,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.2.x-dev"
+ "dev-master": "3.3.x-dev"
}
},
"autoload": {
@@ -3195,7 +3197,7 @@
"testing",
"xunit"
],
- "time": "2016-02-18 07:31:12"
+ "time": "2016-03-03 08:49:08"
},
{
"name": "phpunit/php-file-iterator",
@@ -3377,16 +3379,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "5.2.9",
+ "version": "5.2.12",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "b12b9c37e382c096b93c3f26e7395775f59a5eea"
+ "reference": "6f0948bab32270352f97d1913d82a49338dcb0da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b12b9c37e382c096b93c3f26e7395775f59a5eea",
- "reference": "b12b9c37e382c096b93c3f26e7395775f59a5eea",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6f0948bab32270352f97d1913d82a49338dcb0da",
+ "reference": "6f0948bab32270352f97d1913d82a49338dcb0da",
"shasum": ""
},
"require": {
@@ -3398,7 +3400,7 @@
"myclabs/deep-copy": "~1.3",
"php": "^5.6 || ^7.0",
"phpspec/prophecy": "^1.3.1",
- "phpunit/php-code-coverage": "^3.2.1",
+ "phpunit/php-code-coverage": "^3.3.0",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": ">=1.0.6",
@@ -3447,20 +3449,20 @@
"testing",
"xunit"
],
- "time": "2016-02-19 11:43:07"
+ "time": "2016-03-15 05:59:58"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "3.0.6",
+ "version": "3.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "49bc700750196c04dd6bc2c4c99cb632b893836b"
+ "reference": "7c34c9bdde4131b824086457a3145e27dba10ca1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/49bc700750196c04dd6bc2c4c99cb632b893836b",
- "reference": "49bc700750196c04dd6bc2c4c99cb632b893836b",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/7c34c9bdde4131b824086457a3145e27dba10ca1",
+ "reference": "7c34c9bdde4131b824086457a3145e27dba10ca1",
"shasum": ""
},
"require": {
@@ -3478,7 +3480,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0.x-dev"
+ "dev-master": "3.1.x-dev"
}
},
"autoload": {
@@ -3503,7 +3505,7 @@
"mock",
"xunit"
],
- "time": "2015-12-08 08:47:06"
+ "time": "2016-03-24 05:58:25"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -3668,16 +3670,16 @@
},
{
"name": "sebastian/environment",
- "version": "1.3.3",
+ "version": "1.3.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "6e7133793a8e5a5714a551a8324337374be209df"
+ "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e7133793a8e5a5714a551a8324337374be209df",
- "reference": "6e7133793a8e5a5714a551a8324337374be209df",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
+ "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
"shasum": ""
},
"require": {
@@ -3714,7 +3716,7 @@
"environment",
"hhvm"
],
- "time": "2015-12-02 08:37:27"
+ "time": "2016-02-26 18:40:46"
},
{
"name": "sebastian/exporter",
@@ -3973,7 +3975,7 @@
},
{
"name": "symfony/css-selector",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -4026,16 +4028,16 @@
},
{
"name": "symfony/dom-crawler",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "b693a9650aa004576b593ff2e91ae749dc90123d"
+ "reference": "981c8edb4538f88ba976ed44bdcaa683fce3d6c6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b693a9650aa004576b593ff2e91ae749dc90123d",
- "reference": "b693a9650aa004576b593ff2e91ae749dc90123d",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/981c8edb4538f88ba976ed44bdcaa683fce3d6c6",
+ "reference": "981c8edb4538f88ba976ed44bdcaa683fce3d6c6",
"shasum": ""
},
"require": {
@@ -4078,20 +4080,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2016-01-25 09:56:57"
+ "time": "2016-02-28 16:24:34"
},
{
"name": "symfony/filesystem",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "064ac12afd2ceb8a2c1bfb7bed8e931c6dd1997f"
+ "reference": "23ae8f9648d0a7fe94a47c8e20e5bf37c489a451"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/064ac12afd2ceb8a2c1bfb7bed8e931c6dd1997f",
- "reference": "064ac12afd2ceb8a2c1bfb7bed8e931c6dd1997f",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/23ae8f9648d0a7fe94a47c8e20e5bf37c489a451",
+ "reference": "23ae8f9648d0a7fe94a47c8e20e5bf37c489a451",
"shasum": ""
},
"require": {
@@ -4127,11 +4129,11 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2016-01-27 11:34:55"
+ "time": "2016-02-23 15:16:06"
},
{
"name": "symfony/stopwatch",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
@@ -4180,16 +4182,16 @@
},
{
"name": "symfony/yaml",
- "version": "v3.0.2",
+ "version": "v3.0.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "3cf0709d7fe936e97bee9e954382e449003f1d9a"
+ "reference": "b5ba64cd67ecd6887f63868fa781ca094bd1377c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/3cf0709d7fe936e97bee9e954382e449003f1d9a",
- "reference": "3cf0709d7fe936e97bee9e954382e449003f1d9a",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/b5ba64cd67ecd6887f63868fa781ca094bd1377c",
+ "reference": "b5ba64cd67ecd6887f63868fa781ca094bd1377c",
"shasum": ""
},
"require": {
@@ -4225,7 +4227,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2016-02-02 13:44:19"
+ "time": "2016-02-23 15:16:06"
}
],
"aliases": [
--- a/server/src/tests/Models/DocumentTest.php Mon Mar 21 14:04:19 2016 +0100
+++ b/server/src/tests/Models/DocumentTest.php Fri Mar 25 17:03:45 2016 +0100
@@ -16,7 +16,7 @@
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix fn: <http://www.w3.org/2005/xpath-functions#> .
- <http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND> a <http://www.openarchives.org/ore/terms/Aggregation> ;
+ <%1\$scrdo-CFPP2000_35_SOUND> a <http://www.openarchives.org/ore/terms/Aggregation> ;
<http://www.europeana.eu/schemas/edm/aggregatedCHO> <http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-CFPP2000_35_SOUND> ;
<http://www.europeana.eu/schemas/edm/dataProvider> "Langage et langues : description, théorisation, transmission" ;
<http://www.europeana.eu/schemas/edm/hasView> <http://cocoon.huma-num.fr/exist/crdo/cfpp2000/fra/Ozgur_Kilic_H_32_alii_3e-2.xml> , <http://cocoon.huma-num.fr/data/cfpp2000/Ozgur_Kilic_H_32_alii_3e-2.mp3> , <http://cocoon.huma-num.fr/data/cfpp2000/Ozgur_Kilic_H_32_alii_3e-2.wav> ;
@@ -33,7 +33,7 @@
<http://purl.org/dc/terms/license> <http://creativecommons.org/licenses/by-nc-sa/3.0/> ;
<http://purl.org/dc/elements/1.1/contributor> <http://viaf.org/viaf/93752300> , "Tanguy, Noalig" , "Chevrier, Michel" , "Kiliç, Ozgur" , "Salvegas, Etienne" , "du-Breuil-de-Pont-en-Auge, Augustin" , "du-Breuil-de-Pont-en-Auge, Benoît" ;
<http://purl.org/dc/elements/1.1/description> "Enregistrement issu du Corpus de Français Parlé Parisien des années 2000 (CFPP2000)"@fr , "Quartier(s) concerné(s) : Paris 3e, et 20e (pour l'âge adulte); Anonymisation : Noalig TANGUY;"@fr ;
- <http://purl.org/dc/elements/1.1/identifier> "ark:/87895/1.17-375004" , "corpusparole:crdo-CFPP2000_35_SOUNDid" , "oai:crdo.vjf.cnrs.fr:crdo-CFPP2000_35" , "Cote producteur: [03-01] Ozgur_Kilic_H_32_alii_3e"@fr , "ark:/87895/1.17-372593" , "oai:crdo.vjf.cnrs.fr:crdo-CFPP2000_35_SOUND" ;
+ <http://purl.org/dc/elements/1.1/identifier> "ark:/87895/1.17-375004" , "%2\$scrdo-CFPP2000_35_SOUNDid" , "oai:crdo.vjf.cnrs.fr:crdo-CFPP2000_35" , "Cote producteur: [03-01] Ozgur_Kilic_H_32_alii_3e"@fr , "ark:/87895/1.17-372593" , "oai:crdo.vjf.cnrs.fr:crdo-CFPP2000_35_SOUND" ;
<http://purl.org/dc/elements/1.1/language> <http://lexvo.org/id/iso639-3/fra> ;
<http://purl.org/dc/elements/1.1/publisher> <http://viaf.org/viaf/142432638>;
<http://purl.org/dc/elements/1.1/subject> <http://ark.bnf.fr/ark:/12148/cb13318415c> , "anthropological_linguistics"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "lexicography"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "phonetics"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , <http://lexvo.org/id/iso639-3/fra> , <http://ark.bnf.fr/ark:/12148/cb133188907> , <http://ark.bnf.fr/ark:/12148/cb11932762f> , "general_linguistics"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , <http://ark.bnf.fr/ark:/12148/cb133183660> , "text_and_corpus_linguistics"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "Français"@fr , <http://ark.bnf.fr/ark:/12148/cb122368540> , "phonology"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "semantics"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "sociolinguistics"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "syntax"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "typology"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , <http://ark.bnf.fr/ark:/12148/cb119418302> , <http://ark.bnf.fr/ark:/12148/cb135540729> , "discourse_analysis"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "historical_linguistics"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "language_documentation"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , <http://ark.bnf.fr/ark:/12148/cb133192210> , <http://ark.bnf.fr/ark:/12148/cb119377452> , <http://ark.bnf.fr/ark:/12148/cb13320451h> , <http://ark.bnf.fr/ark:/12148/cb13318422n> , <http://ark.bnf.fr/ark:/12148/cb11975823c> , "mathematical_linguistics"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> ;
@@ -93,22 +93,22 @@
public function setUp() {
parent::setup();
- $this->graph = new EasyRdf\Graph("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", DocumentTest::TEST_DOC);
+ $this->graph = new EasyRdf\Graph(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", sprintf(DocumentTest::TEST_DOC, config('corpusparole.corpus_doc_id_base_uri'), config('corpusparole.corpus_id_scheme')));
}
public function testConstructor() {
$this->assertNotNull($this->graph, 'Graph shoud not be null');
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
- $this->assertEquals('corpusparole:crdo-CFPP2000_35_SOUNDid',$doc->getId(),'Must have the correct id');
+ $this->assertEquals(config('corpusparole.corpus_id_scheme').'crdo-CFPP2000_35_SOUNDid',$doc->getId(),'Must have the correct id');
}
public function testTitle() {
$this->assertNotNull($this->graph, 'Graph shoud not be null');
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$this->assertEquals("Entretien de Ozgur Kiliç 2",$doc->getTitle(),'Must have correct title');
$this->assertInstanceOf(EasyRdf\Literal::class, $doc->getTitle(), "Title must be a literal");
@@ -118,7 +118,7 @@
public function testModified() {
$this->assertNotNull($this->graph, 'Graph shoud not be null');
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$this->assertInstanceOf(EasyRdf\Literal::class, $doc->getModified(), "Modified must be a literal");
$this->assertEquals("http://purl.org/dc/terms/W3CDTF", $doc->getModified()->getDatatypeURI(), "type must be http://purl.org/dc/terms/W3CDTF");
$this->assertEquals("2013-10-12T14:35:57+02:00", $doc->getModified(), "modified must be 2013-10-12T14:35:57+02:00");
@@ -127,7 +127,7 @@
public function testSetModified() {
$currentTime = gmdate(DateTime::ATOM);
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$doc->setModified($currentTime);
$this->assertInstanceOf(EasyRdf\Literal::class, $doc->getModified(), "Modified must be a literal");
$this->assertEquals("http://purl.org/dc/terms/W3CDTF", $doc->getModified()->getDatatypeURI(), "type must be http://purl.org/dc/terms/W3CDTF");
@@ -135,7 +135,7 @@
}
public function testSetModifiedNull() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$doc->setModified();
$this->assertInstanceOf(EasyRdf\Literal::class, $doc->getModified(), "Modified must be a literal");
$this->assertEquals("http://purl.org/dc/terms/W3CDTF", $doc->getModified()->getDatatypeURI(), "type must be http://purl.org/dc/terms/W3CDTF");
@@ -146,7 +146,7 @@
public function testPublisher() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$this->assertCount(1, $doc->getPublishers(), 'Publisher is an array of size 1');
$this->assertInstanceOf('EasyRdf\Resource', $doc->getPublishers()[0], 'publisher is a resource');
@@ -154,7 +154,7 @@
}
public function testMediaArray() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$this->assertCount(4, $doc->getMediaArray(), "Media array must be of size 4");
//print_r($doc->getMediaArray());
@@ -201,7 +201,7 @@
}
public function testGetTypes() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$this->assertCount(8, $doc->getTypes(), "types array must be of size 5");
@@ -217,7 +217,7 @@
}
public function testGetOtherTypes() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$this->assertCount(5, $doc->getOtherTypes(), "types array must be of size 5");
@@ -233,7 +233,7 @@
}
public function testGetDiscourseTypes() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$this->assertCount(3, $doc->getDiscourseTypes(), "types array must be of size 3");
@@ -244,7 +244,7 @@
}
public function testCloneDocument() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$doc2 = clone $doc;
@@ -255,8 +255,8 @@
}
public function testIsIsomorphic() {
- $doc1 = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
- $doc2 = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", new EasyRdf\Graph("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", DocumentTest::TEST_DOC));
+ $doc1 = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc2 = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", new EasyRdf\Graph(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", sprintf(DocumentTest::TEST_DOC, config('corpusparole.corpus_doc_id_base_uri'), config('corpusparole.corpus_id_scheme'))));
$this->assertTrue($doc1->isIsomorphic($doc2),"document must be isomorphic");
@@ -269,7 +269,7 @@
$newDiscourseTypes = ['oratory','dialogue','narrative', 'formulaic', 'ludic'];
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$this->assertCount(3, $doc->getDiscourseTypes(), "types array must be of size 3");
$doc->updateDiscourseTypes($newDiscourseTypes);
@@ -287,7 +287,7 @@
$newDiscourseTypes = ['oratory','dialogue','narrative', 'formulaic', 'ludic'];
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$doc->updateDiscourseTypes($newDiscourseTypes);
@@ -297,8 +297,8 @@
$delta = $doc->getDeltaList()[0];
- $this->assertEquals("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $delta->getDeletedGraph()->getUri(), "uri of deleted graph must be ok");
- $this->assertEquals("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $delta->getAddedGraph()->getUri(), "uri of added graph must be ok");
+ $this->assertEquals(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $delta->getDeletedGraph()->getUri(), "uri of deleted graph must be ok");
+ $this->assertEquals(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $delta->getAddedGraph()->getUri(), "uri of added graph must be ok");
$this->assertEquals(3, $delta->getDeletedGraph()->countTriples(), "deleted graph must have only 3 triples");
$this->assertEquals(5, $delta->getAddedGraph()->countTriples(), "deleted graph must have only 5 triples");
@@ -315,7 +315,7 @@
}
public function testUpdateTitle() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$oldTitle = $doc->getTitle();
@@ -343,16 +343,16 @@
$newDiscourseTypes = ['oratory','dialogue','narrative'];
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$doc->updateDiscourseTypes($newDiscourseTypes);
- $doc2 = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", new EasyRdf\Graph("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", DocumentTest::TEST_DOC));
+ $doc2 = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", new EasyRdf\Graph(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", sprintf(DocumentTest::TEST_DOC, config('corpusparole.corpus_doc_id_base_uri'), config('corpusparole.corpus_id_scheme'))));
$this->assertFalse($doc->isIsomorphic($doc2),"document must not be isomorphic after adding discourse type");
}
public function testGetContributors() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$contributors = $doc->getContributors();
@@ -368,7 +368,7 @@
}
public function testSetContributors() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$contributors = $doc->getContributors();
@@ -445,7 +445,7 @@
}
public function testGetSubjects() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$subjects = $doc->getSubjects();
@@ -463,7 +463,7 @@
}
public function testSetSubjects() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-CFPP2000_35_SOUND", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-CFPP2000_35_SOUND", $this->graph);
$newSubjects = [
"http://ark.bnf.fr/ark:/12148/cb13318415c",
--- a/server/src/tests/Repositories/DocumentRepositoryIntegrationTest.php Mon Mar 21 14:04:19 2016 +0100
+++ b/server/src/tests/Repositories/DocumentRepositoryIntegrationTest.php Fri Mar 25 17:03:45 2016 +0100
@@ -42,66 +42,66 @@
@prefix fn: <http://www.w3.org/2005/xpath-functions#> .
_:genid-2267740936ad4d04a567e6787732f0dd-genid1 a <http://www.europeana.eu/schemas/edm/Place> ;
- owl:sameAs <http://sws.geonames.org/3038033/> ;
- <http://www.w3.org/2004/02/skos/core#note> "northlimit=47.431892250000033; southlimit=49.053971250000046;westlimit=6.846186050000028; eastlimit=8.232571550000074;"^^<http://purl.org/dc/terms/Box> , "FR"^^<http://purl.org/dc/terms/ISO3166> , "France, Alsace"@fr .
+ owl:sameAs <http://sws.geonames.org/3038033/> ;
+ <http://www.w3.org/2004/02/skos/core#note> "northlimit=47.431892250000033; southlimit=49.053971250000046;westlimit=6.846186050000028; eastlimit=8.232571550000074;"^^<http://purl.org/dc/terms/Box> , "FR"^^<http://purl.org/dc/terms/ISO3166> , "France, Alsace"@fr .
- <http://corpusdelaparole.huma-num.fr/corpus/res/crdo-ALA_738> a <http://www.openarchives.org/ore/terms/Aggregation> ;
- <http://www.europeana.eu/schemas/edm/aggregatedCHO> <http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-ALA_738> ;
- <http://www.europeana.eu/schemas/edm/dataProvider> "Atlas linguistiques, cultures et parlers régionaux de France" ;
- <http://www.europeana.eu/schemas/edm/hasView> <http://cocoon.huma-num.fr/data/ala/ALA_738.mp3> , <http://cocoon.huma-num.fr/data/ala/ALA_738_22km.wav> ;
- <http://www.europeana.eu/schemas/edm/isShownAt> <http://corpusdelaparole.huma-num.fr/corpus-app#/detail/crdo-ALA_738> ;
- <http://www.europeana.eu/schemas/edm/isShownBy> <http://cocoon.huma-num.fr/data/ala/masters/ALA_738.wav> ;
- <http://www.europeana.eu/schemas/edm/provider> "Corpus de la Parole"@fr ;
- <http://www.europeana.eu/schemas/edm/rights> <http://creativecommons.org/licenses/by-nc-nd/4.0/> .
+ <%1\$scrdo-ALA_738> a <http://www.openarchives.org/ore/terms/Aggregation> ;
+ <http://www.europeana.eu/schemas/edm/aggregatedCHO> <http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-ALA_738> ;
+ <http://www.europeana.eu/schemas/edm/dataProvider> "Atlas linguistiques, cultures et parlers régionaux de France" ;
+ <http://www.europeana.eu/schemas/edm/hasView> <http://cocoon.huma-num.fr/data/ala/ALA_738.mp3> , <http://cocoon.huma-num.fr/data/ala/ALA_738_22km.wav> ;
+ <http://www.europeana.eu/schemas/edm/isShownAt> <http://corpusdelaparole.huma-num.fr/corpus-app#/detail/crdo-ALA_738> ;
+ <http://www.europeana.eu/schemas/edm/isShownBy> <http://cocoon.huma-num.fr/data/ala/masters/ALA_738.wav> ;
+ <http://www.europeana.eu/schemas/edm/provider> "Corpus de la Parole"@fr ;
+ <http://www.europeana.eu/schemas/edm/rights> <http://creativecommons.org/licenses/by-nc-nd/4.0/> .
<http://cocoon.huma-num.fr/data/ala/ALA_738.mp3> a <http://www.europeana.eu/schemas/edm/WebResource> ;
- <http://purl.org/dc/elements/1.1/format> "audio/mpeg"^^<http://purl.org/dc/terms/IMT> ;
- <http://purl.org/dc/terms/created> "1996"^^<http://purl.org/dc/terms/Period> ;
- <http://purl.org/dc/terms/extent> "PT01H11M29S" ;
- <http://purl.org/dc/terms/issued> "2014-11-10T14:27:08+01:00"^^<http://purl.org/dc/terms/W3CDTF> ;
- <http://www.europeana.eu/schemas/edm/isDerivativeOf> <http://cocoon.huma-num.fr/data/ala/masters/ALA_738.wav> .
+ <http://purl.org/dc/elements/1.1/format> "audio/mpeg"^^<http://purl.org/dc/terms/IMT> ;
+ <http://purl.org/dc/terms/created> "1996"^^<http://purl.org/dc/terms/Period> ;
+ <http://purl.org/dc/terms/extent> "PT01H11M29S" ;
+ <http://purl.org/dc/terms/issued> "2014-11-10T14:27:08+01:00"^^<http://purl.org/dc/terms/W3CDTF> ;
+ <http://www.europeana.eu/schemas/edm/isDerivativeOf> <http://cocoon.huma-num.fr/data/ala/masters/ALA_738.wav> .
<http://cocoon.huma-num.fr/data/ala/masters/ALA_738.wav> a <http://www.europeana.eu/schemas/edm/WebResource> ;
- <http://purl.org/dc/elements/1.1/format> "audio/x-wav"^^<http://purl.org/dc/terms/IMT> ;
- <http://purl.org/dc/terms/created> "1996"^^<http://purl.org/dc/terms/Period> ;
- <http://purl.org/dc/terms/extent> "PT01H11M29S" ;
- <http://purl.org/dc/terms/issued> "2014-11-10T14:27:08+01:00"^^<http://purl.org/dc/terms/W3CDTF> .
+ <http://purl.org/dc/elements/1.1/format> "audio/x-wav"^^<http://purl.org/dc/terms/IMT> ;
+ <http://purl.org/dc/terms/created> "1996"^^<http://purl.org/dc/terms/Period> ;
+ <http://purl.org/dc/terms/extent> "PT01H11M29S" ;
+ <http://purl.org/dc/terms/issued> "2014-11-10T14:27:08+01:00"^^<http://purl.org/dc/terms/W3CDTF> .
<http://cocoon.huma-num.fr/data/ala/ALA_738_22km.wav> a <http://www.europeana.eu/schemas/edm/WebResource> ;
- <http://purl.org/dc/elements/1.1/format> "audio/x-wav"^^<http://purl.org/dc/terms/IMT> ;
- <http://purl.org/dc/terms/created> "1996"^^<http://purl.org/dc/terms/Period> ;
- <http://purl.org/dc/terms/extent> "PT01H11M29S" ;
- <http://purl.org/dc/terms/issued> "2014-11-10T14:27:08+01:00"^^<http://purl.org/dc/terms/W3CDTF> ;
- <http://www.europeana.eu/schemas/edm/isDerivativeOf> <http://cocoon.huma-num.fr/data/ala/masters/ALA_738.wav> .
+ <http://purl.org/dc/elements/1.1/format> "audio/x-wav"^^<http://purl.org/dc/terms/IMT> ;
+ <http://purl.org/dc/terms/created> "1996"^^<http://purl.org/dc/terms/Period> ;
+ <http://purl.org/dc/terms/extent> "PT01H11M29S" ;
+ <http://purl.org/dc/terms/issued> "2014-11-10T14:27:08+01:00"^^<http://purl.org/dc/terms/W3CDTF> ;
+ <http://www.europeana.eu/schemas/edm/isDerivativeOf> <http://cocoon.huma-num.fr/data/ala/masters/ALA_738.wav> .
<http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-ALA_738> a <http://www.europeana.eu/schemas/edm/ProvidedCHO> ;
- <http://purl.org/dc/terms/created> "1996"^^<http://purl.org/dc/terms/Period> ;
- <http://purl.org/dc/terms/extent> "PT01H11M29S" ;
- <http://purl.org/dc/terms/issued> "2014-11-10T14:27:08+01:00"^^<http://purl.org/dc/terms/W3CDTF> ;
- <http://purl.org/dc/elements/1.1/contributor> <http://viaf.org/viaf/61542329> , <http://viaf.org/viaf/9122216> ;
- <http://purl.org/dc/elements/1.1/description> "Extrait des enquêtes dialectologiques en vue de constituer un atlas linguistique de l'Alsace."@fr ;
- <http://purl.org/dc/elements/1.1/language> <http://lexvo.org/id/iso639-3/gsw> ;
- <http://purl.org/dc/elements/1.1/publisher> "Atlas linguistiques, cultures et parlers régionaux de France" ;
- <http://purl.org/dc/elements/1.1/rights> "Copyright (c) Département de dialectologie alsacienne et mosellane de l'Université de Strasbourg" ;
- <http://purl.org/dc/elements/1.1/subject> <http://lexvo.org/id/iso639-3/gsw> , <http://ark.bnf.fr/ark:/12148/cb11931472p> , <http://ark.bnf.fr/ark:/12148/cb11931564b> , <http://ark.bnf.fr/ark:/12148/cb11932194d> , <http://ark.bnf.fr/ark:/12148/cb11933029x> , <http://ark.bnf.fr/ark:/12148/cb11933281k> , <http://ark.bnf.fr/ark:/12148/cb11934740m> , <http://ark.bnf.fr/ark:/12148/cb11935375d> , <http://ark.bnf.fr/ark:/12148/cb11935986q> , <http://ark.bnf.fr/ark:/12148/cb11936549n> , <http://ark.bnf.fr/ark:/12148/cb11937931x> , <http://ark.bnf.fr/ark:/12148/cb119392962> , <http://ark.bnf.fr/ark:/12148/cb119458243> , <http://ark.bnf.fr/ark:/12148/cb11946662b> , <http://ark.bnf.fr/ark:/12148/cb11947332t> , <http://ark.bnf.fr/ark:/12148/cb119481497> , <http://ark.bnf.fr/ark:/12148/cb119591726> , <http://ark.bnf.fr/ark:/12148/cb119756721> , <http://ark.bnf.fr/ark:/12148/cb119757609> , <http://ark.bnf.fr/ark:/12148/cb11975806s> , <http://ark.bnf.fr/ark:/12148/cb119759527> , <http://ark.bnf.fr/ark:/12148/cb12032030g> , <http://ark.bnf.fr/ark:/12148/cb12042429k> , <http://ark.bnf.fr/ark:/12148/cb12099148r> , <http://ark.bnf.fr/ark:/12148/cb12148936v> , <http://ark.bnf.fr/ark:/12148/cb12289036m> , <http://ark.bnf.fr/ark:/12148/cb13318335q> , <http://ark.bnf.fr/ark:/12148/cb133183540> , <http://ark.bnf.fr/ark:/12148/cb13318415c> , <http://ark.bnf.fr/ark:/12148/cb13318491g> , "anthropological_linguistics"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "lexicography"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "phonetics"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> ;
- <http://purl.org/dc/elements/1.1/title> "Atlas Linguistique et ethnographique de l'Alsace - Enquetes sur la conscience linguistique - ALA_738"@fr ;
- <http://purl.org/dc/elements/1.1/type> <http://ark.bnf.fr/ark:/12148/cb11932135w> , <http://ark.bnf.fr/ark:/12148/cb12481481z> , <http://purl.org/dc/dcmitype/Sound> , "dialogue"^^<http://www.language-archives.org/OLAC/1.1/discourse-type> , "primary_text"^^<http://www.language-archives.org/OLAC/1.1/linguistic-type> ;
- <http://purl.org/dc/terms/accessRights> "Freely available for non-commercial use" ;
- <http://purl.org/dc/terms/available> "2004-07-03"^^<http://purl.org/dc/terms/W3CDTF> ;
- <http://purl.org/dc/terms/isPartOf> <http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-COLLECTION_ALA_CL> , <http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-COLLECTION_LANGUESDEFRANCE> ;
- <http://purl.org/dc/terms/license> <http://creativecommons.org/licenses/by-nc-nd/2.5/> ;
- <http://purl.org/dc/terms/spatial> _:genid-2267740936ad4d04a567e6787732f0dd-genid1 ;
- <http://www.language-archives.org/OLAC/1.1/depositor> <http://viaf.org/viaf/9122216> ;
- <http://www.language-archives.org/OLAC/1.1/interviewer> <http://viaf.org/viaf/61542329> , <http://viaf.org/viaf/9122216> .
+ <http://purl.org/dc/terms/created> "1996"^^<http://purl.org/dc/terms/Period> ;
+ <http://purl.org/dc/terms/extent> "PT01H11M29S" ;
+ <http://purl.org/dc/terms/issued> "2014-11-10T14:27:08+01:00"^^<http://purl.org/dc/terms/W3CDTF> ;
+ <http://purl.org/dc/elements/1.1/contributor> <http://viaf.org/viaf/61542329> , <http://viaf.org/viaf/9122216> ;
+ <http://purl.org/dc/elements/1.1/description> "Extrait des enquêtes dialectologiques en vue de constituer un atlas linguistique de l'Alsace."@fr ;
+ <http://purl.org/dc/elements/1.1/language> <http://lexvo.org/id/iso639-3/gsw> ;
+ <http://purl.org/dc/elements/1.1/publisher> "Atlas linguistiques, cultures et parlers régionaux de France" ;
+ <http://purl.org/dc/elements/1.1/rights> "Copyright (c) Département de dialectologie alsacienne et mosellane de l'Université de Strasbourg" ;
+ <http://purl.org/dc/elements/1.1/subject> <http://lexvo.org/id/iso639-3/gsw> , <http://ark.bnf.fr/ark:/12148/cb11931472p> , <http://ark.bnf.fr/ark:/12148/cb11931564b> , <http://ark.bnf.fr/ark:/12148/cb11932194d> , <http://ark.bnf.fr/ark:/12148/cb11933029x> , <http://ark.bnf.fr/ark:/12148/cb11933281k> , <http://ark.bnf.fr/ark:/12148/cb11934740m> , <http://ark.bnf.fr/ark:/12148/cb11935375d> , <http://ark.bnf.fr/ark:/12148/cb11935986q> , <http://ark.bnf.fr/ark:/12148/cb11936549n> , <http://ark.bnf.fr/ark:/12148/cb11937931x> , <http://ark.bnf.fr/ark:/12148/cb119392962> , <http://ark.bnf.fr/ark:/12148/cb119458243> , <http://ark.bnf.fr/ark:/12148/cb11946662b> , <http://ark.bnf.fr/ark:/12148/cb11947332t> , <http://ark.bnf.fr/ark:/12148/cb119481497> , <http://ark.bnf.fr/ark:/12148/cb119591726> , <http://ark.bnf.fr/ark:/12148/cb119756721> , <http://ark.bnf.fr/ark:/12148/cb119757609> , <http://ark.bnf.fr/ark:/12148/cb11975806s> , <http://ark.bnf.fr/ark:/12148/cb119759527> , <http://ark.bnf.fr/ark:/12148/cb12032030g> , <http://ark.bnf.fr/ark:/12148/cb12042429k> , <http://ark.bnf.fr/ark:/12148/cb12099148r> , <http://ark.bnf.fr/ark:/12148/cb12148936v> , <http://ark.bnf.fr/ark:/12148/cb12289036m> , <http://ark.bnf.fr/ark:/12148/cb13318335q> , <http://ark.bnf.fr/ark:/12148/cb133183540> , <http://ark.bnf.fr/ark:/12148/cb13318415c> , <http://ark.bnf.fr/ark:/12148/cb13318491g> , "anthropological_linguistics"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "lexicography"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> , "phonetics"^^<http://www.language-archives.org/OLAC/1.1/linguistic-field> ;
+ <http://purl.org/dc/elements/1.1/title> "Atlas Linguistique et ethnographique de l'Alsace - Enquetes sur la conscience linguistique - ALA_738"@fr ;
+ <http://purl.org/dc/elements/1.1/type> <http://ark.bnf.fr/ark:/12148/cb11932135w> , <http://ark.bnf.fr/ark:/12148/cb12481481z> , <http://purl.org/dc/dcmitype/Sound> , "dialogue"^^<http://www.language-archives.org/OLAC/1.1/discourse-type> , "primary_text"^^<http://www.language-archives.org/OLAC/1.1/linguistic-type> ;
+ <http://purl.org/dc/terms/accessRights> "Freely available for non-commercial use" ;
+ <http://purl.org/dc/terms/available> "2004-07-03"^^<http://purl.org/dc/terms/W3CDTF> ;
+ <http://purl.org/dc/terms/isPartOf> <http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-COLLECTION_ALA_CL> , <http://purl.org/poi/crdo.vjf.cnrs.fr/crdo-COLLECTION_LANGUESDEFRANCE> ;
+ <http://purl.org/dc/terms/license> <http://creativecommons.org/licenses/by-nc-nd/2.5/> ;
+ <http://purl.org/dc/terms/spatial> _:genid-2267740936ad4d04a567e6787732f0dd-genid1 ;
+ <http://www.language-archives.org/OLAC/1.1/depositor> <http://viaf.org/viaf/9122216> ;
+ <http://www.language-archives.org/OLAC/1.1/interviewer> <http://viaf.org/viaf/61542329> , <http://viaf.org/viaf/9122216> .
EOT;
function __construct(string $name = null) {
parent::__construct($name);
- $this->graph = new EasyRdf\Graph("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-ALA_738", DocumentRepositoryIntegrationTest::TEST_DOC);
}
public function setUp() {
parent::setUp();
+ $this->graph = new EasyRdf\Graph(config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_738", sprintf(DocumentRepositoryIntegrationTest::TEST_DOC, config('corpusparole.corpus_doc_id_base_uri')));
$this->httpClient = new Client(['base_uri' => config('corpusparole.sesame_base_url')]);
$this->sesameRepository = config('corpusparole.sesame_repository');
@@ -118,8 +118,8 @@
]);
$this->httpClient->put("repositories/$this->sesameRepository/statements", [
'headers' => ['Content-type' => 'text/turtle;charset=UTF-8'],
- 'body' => DocumentRepositoryIntegrationTest::TEST_DOC,
- 'query' => ['context' => '<http://corpusdelaparole.huma-num.fr/corpus/res/crdo-ALA_738>'],
+ 'body' => sprintf(DocumentRepositoryIntegrationTest::TEST_DOC, config('corpusparole.corpus_doc_id_base_uri')),
+ 'query' => ['context' => "<".config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_738>"],
]);
}
@@ -136,7 +136,7 @@
$resDoc = $docList[0];
$this->assertInstanceOf(Document::class, $resDoc, "Res doc must be a Document");
- $this->assertEquals('corpusparole:crdo-ALA_738', $resDoc->getId(), "id must be crdo...");
+ $this->assertEquals(config('corpusparole.corpus_id_scheme').'crdo-ALA_738', $resDoc->getId(), "id must be crdo...");
$this->assertEquals($expectedId, $resDoc->getUri(), 'url must be ...');
$this->assertNotNull($resDoc->getGraph(), 'Graph must not be null');
@@ -145,20 +145,20 @@
public function testGet() {
$expectedId = $this->corpusDocIdBaseUri.'crdo-ALA_738';
- $returnedGraph = new EasyRdf\Graph($expectedId, DocumentRepositoryIntegrationTest::TEST_DOC);
+ $returnedGraph = new EasyRdf\Graph($expectedId, sprintf(DocumentRepositoryIntegrationTest::TEST_DOC,config('corpusparole.corpus_doc_id_base_uri')));
$res = $this->documentRepository->get('crdo-ALA_738');
$this->assertInstanceOf(Document::class, $res, "Result must be of type Document");
- $this->assertEquals('corpusparole:crdo-ALA_738', $res->getId(), 'id should be crdo-ALA_738' );
+ $this->assertEquals(config('corpusparole.corpus_id_scheme').'crdo-ALA_738', $res->getId(), 'id should be crdo-ALA_738' );
$this->assertNotNull($res->getGraph(), "Graph shoul not be null");
- $this->assertEquals("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-ALA_738",$res->getGraph()->getUri(), "uri of graph must be http://corpusdelaparole.huma-num.fr/corpus/res/crdo-ALA_738");
+ $this->assertEquals(config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_738",$res->getGraph()->getUri(), "uri of graph must be ".config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_738");
$this->assertTrue(EasyRdf\Isomorphic::isomorphic($res->getGraph(),$returnedGraph));
}
public function testSave() {
- $doc = new Document("http://corpusdelaparole.huma-num.fr/corpus/res/crdo-ALA_738", $this->graph);
+ $doc = new Document(config('corpusparole.corpus_doc_id_base_uri')."crdo-ALA_738", $this->graph);
$doc->updateDiscourseTypes(['oratory','drama','narrative']);
$res = $this->documentRepository->save($doc);