diff --git a/composer.json b/composer.json index ac4d8c228..30b6fea5a 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "repositories": [ { "type": "composer", - "url": "http://packagist.org/" + "url": "https://packagist.org/" }, { "type": "git", @@ -27,7 +27,7 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "luracast/restler": "3.0.0-RC4", + "luracast/restler": "3.0.0-RC5", "bshaffer/oauth2-server-php": "v1.0", "colosa/pmUI": "3.1-dev", "colosa/MichelangeloFE": "3.1-dev", diff --git a/composer.lock b/composer.lock index 34eee0a33..68c03aa28 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "07bfffacf6ecea0e4afac342d4db00a3", - "content-hash": "d12b99e8a25a545c85e8b5ab125daba2", + "hash": "9256746135622162ab9868a31a9f79c0", + "content-hash": "e3a05d57374607de60f795f5b707cd16", "packages": [ { "name": "bshaffer/oauth2-server-php", @@ -193,25 +193,29 @@ }, { "name": "luracast/restler", - "version": "3.0.0-RC4", + "version": "3.0.0-RC5", "source": { "type": "git", "url": "https://github.com/Luracast/Restler.git", - "reference": "72c28484d6a7677643324744be2ff0aab6795d5a" + "reference": "1dcf910c1e1fd1ea565a537b053a66971d818e42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Luracast/Restler/zipball/72c28484d6a7677643324744be2ff0aab6795d5a", - "reference": "72c28484d6a7677643324744be2ff0aab6795d5a", + "url": "https://api.github.com/repos/Luracast/Restler/zipball/1dcf910c1e1fd1ea565a537b053a66971d818e42", + "reference": "1dcf910c1e1fd1ea565a537b053a66971d818e42", "shasum": "" }, "require": { "php": ">=5.3.0" }, + "conflict": { + "restler/framework": "3.*" + }, "require-dev": { - "behat/behat": "2.4.*@stable", - "bshaffer/oauth2-server-php": "v0.3", + "behat/behat": "2.5.*@stable", + "bshaffer/oauth2-server-php": "v1.0", "guzzle/guzzle": "~3.1.1", + "illuminate/view": "4.2.*", "luracast/explorer": "*", "mustache/mustache": "dev-master", "rodneyrehm/plist": "dev-master", @@ -223,6 +227,7 @@ "behat/behat": "Behaviour driven development testing framework (see require-dev for details)", "bshaffer/oauth2-server-php": "Restler can provide OAuth2 authentication using this library (see require-dev for details)", "guzzle/guzzle": "RESTful api HTTP client framework (see require-dev for details)", + "illuminate/view": "Restler can render HtmlView using laravel blade templates (see require-dev for details)", "luracast/explorer": "Restler's very own api explorer (see require-dev for details)", "mustache/mustache": "Restler can render HtmlView using mustache/handlebar templates (see require-dev for details)", "rodneyrehm/plist": "Restler supports tho Apple plist xml format (see require-dev for details)", @@ -241,7 +246,7 @@ "Luracast\\Restler": "vendor/" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "LGPL-2.1" ], @@ -263,7 +268,7 @@ "rest", "server" ], - "time": "2014-04-13 05:38:15" + "time": "2015-08-04 07:52:49" } ], "packages-dev": [ @@ -489,16 +494,16 @@ }, { "name": "symfony/config", - "version": "v2.8.7", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "a2edd59c2163c65747fc3f35d132b5a39266bd05" + "reference": "0926e69411eba491803dbafb9f1f233e2ced58d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/a2edd59c2163c65747fc3f35d132b5a39266bd05", - "reference": "a2edd59c2163c65747fc3f35d132b5a39266bd05", + "url": "https://api.github.com/repos/symfony/config/zipball/0926e69411eba491803dbafb9f1f233e2ced58d0", + "reference": "0926e69411eba491803dbafb9f1f233e2ced58d0", "shasum": "" }, "require": { @@ -522,7 +527,7 @@ "/Tests/" ] }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -538,20 +543,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2016-06-06 11:11:27" + "time": "2016-06-29 05:31:50" }, { "name": "symfony/console", - "version": "v2.8.7", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3" + "reference": "c392a6ec72f2122748032c2ad6870420561ffcfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3", - "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3", + "url": "https://api.github.com/repos/symfony/console/zipball/c392a6ec72f2122748032c2ad6870420561ffcfa", + "reference": "c392a6ec72f2122748032c2ad6870420561ffcfa", "shasum": "" }, "require": { @@ -582,7 +587,7 @@ "/Tests/" ] }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -598,20 +603,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-06-06 15:06:25" + "time": "2016-06-29 07:02:14" }, { "name": "symfony/dependency-injection", - "version": "v2.8.7", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "2d05009d890cf1139988ff059b5b2e0eb280ed13" + "reference": "2dd85de8216079d1360b2b14988cd5cdbbb49063" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2d05009d890cf1139988ff059b5b2e0eb280ed13", - "reference": "2d05009d890cf1139988ff059b5b2e0eb280ed13", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2dd85de8216079d1360b2b14988cd5cdbbb49063", + "reference": "2dd85de8216079d1360b2b14988cd5cdbbb49063", "shasum": "" }, "require": { @@ -645,7 +650,7 @@ "/Tests/" ] }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -661,20 +666,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2016-06-06 11:11:27" + "time": "2016-06-29 05:31:50" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.7", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "2a6b8713f8bdb582058cfda463527f195b066110" + "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2a6b8713f8bdb582058cfda463527f195b066110", - "reference": "2a6b8713f8bdb582058cfda463527f195b066110", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b180b70439dca70049b6b9b7e21d75e6e5d7aca9", + "reference": "b180b70439dca70049b6b9b7e21d75e6e5d7aca9", "shasum": "" }, "require": { @@ -705,7 +710,7 @@ "/Tests/" ] }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -721,20 +726,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-06-06 11:11:27" + "time": "2016-06-29 05:29:29" }, { "name": "symfony/filesystem", - "version": "v3.0.7", + "version": "v3.0.8", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "74fec3511b62cb934b64bce1d96f06fffa4beafd" + "reference": "a108b1d603ccb52addb5da9b14a3ba259f8b3db0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/74fec3511b62cb934b64bce1d96f06fffa4beafd", - "reference": "74fec3511b62cb934b64bce1d96f06fffa4beafd", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/a108b1d603ccb52addb5da9b14a3ba259f8b3db0", + "reference": "a108b1d603ccb52addb5da9b14a3ba259f8b3db0", "shasum": "" }, "require": { @@ -754,7 +759,7 @@ "/Tests/" ] }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -770,7 +775,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2016-04-12 18:09:53" + "time": "2016-06-29 05:40:00" }, { "name": "symfony/finder", @@ -883,16 +888,16 @@ }, { "name": "symfony/translation", - "version": "v2.8.7", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "8a1648d2e165ba87c759ba57d7f4c13d95fdf4a1" + "reference": "00334ef0b9317e5d7c7641a2b56671a1df23b7a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/8a1648d2e165ba87c759ba57d7f4c13d95fdf4a1", - "reference": "8a1648d2e165ba87c759ba57d7f4c13d95fdf4a1", + "url": "https://api.github.com/repos/symfony/translation/zipball/00334ef0b9317e5d7c7641a2b56671a1df23b7a0", + "reference": "00334ef0b9317e5d7c7641a2b56671a1df23b7a0", "shasum": "" }, "require": { @@ -927,7 +932,7 @@ "/Tests/" ] }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -943,20 +948,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2016-06-06 11:11:27" + "time": "2016-06-29 05:29:29" }, { "name": "symfony/yaml", - "version": "v2.8.7", + "version": "v2.8.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34" + "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/815fabf3f48c7d1df345a69d1ad1a88f59757b34", - "reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34", + "url": "https://api.github.com/repos/symfony/yaml/zipball/dba4bb5846798cd12f32e2d8f3f35d77045773c8", + "reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8", "shasum": "" }, "require": { @@ -976,7 +981,7 @@ "/Tests/" ] }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -992,7 +997,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-06-06 11:11:27" + "time": "2016-06-29 05:29:29" } ], "aliases": [],