diff --git a/htdocs/composer.json b/htdocs/composer.json index 5296d2ed..a4c956ef 100644 --- a/htdocs/composer.json +++ b/htdocs/composer.json @@ -4,13 +4,13 @@ "require": { "php": ">=5.3.0", "ezyang/htmlpurifier": "4.5.0", - "smarty/smarty": "2.6.26", + "smarty/smarty": "~2.6", "ocpl/okapi": "dev-master", - "symfony/dependency-injection": "dev-master", - "symfony/yaml": "dev-master", - "symfony/config": "dev-master", - "ccampbell/chromephp": "dev-master", - "html2text/html2text": "dev-master", + "symfony/dependency-injection": "~2.6", + "symfony/yaml": "~2.6", + "symfony/config": "~2.6", + "ccampbell/chromephp": "~4.1", + "html2text/html2text": "~2.0", "iamcal/rfc822": "dev-master" }, "autoload": { @@ -52,6 +52,25 @@ } } }, + { + "type": "package", + "package": { + "name": "smarty/smarty", + "version": "2.6.28", + "dist": { + "url": "http://www.smarty.net/files/Smarty-2.6.28.tar.gz", + "type": "tar" + }, + "source": { + "type": "svn", + "url": "http://smarty-php.googlecode.com/svn/", + "reference": "tags/Smarty_2_6_28/" + }, + "autoload": { + "classmap": [ "libs/" ] + } + } + }, { "type": "package", "package": { diff --git a/htdocs/composer.lock b/htdocs/composer.lock index 566d9e92..946be875 100644 --- a/htdocs/composer.lock +++ b/htdocs/composer.lock @@ -4,11 +4,11 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "996c85e20104152247e950ffe2359b13", + "hash": "0e72a533613c738f5a7e5ec44c214dc5", "packages": [ { "name": "ccampbell/chromephp", - "version": "dev-master", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/ccampbell/chromephp.git", @@ -96,16 +96,16 @@ }, { "name": "html2text/html2text", - "version": "dev-master", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/mtibben/html2text.git", - "reference": "9f7cc61eb2aa857db00144294b52e422500627d1" + "reference": "fc9589518a1b2241b88210839a945ad088840122" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mtibben/html2text/zipball/9f7cc61eb2aa857db00144294b52e422500627d1", - "reference": "9f7cc61eb2aa857db00144294b52e422500627d1", + "url": "https://api.github.com/repos/mtibben/html2text/zipball/fc9589518a1b2241b88210839a945ad088840122", + "reference": "fc9589518a1b2241b88210839a945ad088840122", "shasum": "" }, "require-dev": { @@ -125,7 +125,7 @@ "GPLv2" ], "description": "Converts HTML to formatted plain text", - "time": "2014-10-29 11:01:16" + "time": "2014-10-18 05:42:57" }, { "name": "iamcal/rfc822", @@ -160,15 +160,15 @@ }, { "name": "smarty/smarty", - "version": "2.6.26", + "version": "2.6.28", "source": { "type": "svn", "url": "http://smarty-php.googlecode.com/svn/", - "reference": "tags/Smarty_2_6_26/" + "reference": "tags/Smarty_2_6_28/" }, "dist": { "type": "tar", - "url": "http://www.smarty.net/files/Smarty-2.6.26.tar.gz", + "url": "http://www.smarty.net/files/Smarty-2.6.28.tar.gz", "reference": null, "shasum": null }, @@ -181,17 +181,17 @@ }, { "name": "symfony/config", - "version": "dev-master", + "version": "v2.6.3", "target-dir": "Symfony/Component/Config", "source": { "type": "git", "url": "https://github.com/symfony/Config.git", - "reference": "2a4f54fb219af78037a07d8c5d494149762ce324" + "reference": "d94f222eff99a22ce313555b78642b4873418d56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/2a4f54fb219af78037a07d8c5d494149762ce324", - "reference": "2a4f54fb219af78037a07d8c5d494149762ce324", + "url": "https://api.github.com/repos/symfony/Config/zipball/d94f222eff99a22ce313555b78642b4873418d56", + "reference": "d94f222eff99a22ce313555b78642b4873418d56", "shasum": "" }, "require": { @@ -225,30 +225,33 @@ ], "description": "Symfony Config Component", "homepage": "http://symfony.com", - "time": "2014-10-26 07:46:28" + "time": "2015-01-03 08:01:59" }, { "name": "symfony/dependency-injection", - "version": "dev-master", + "version": "v2.6.3", "target-dir": "Symfony/Component/DependencyInjection", "source": { "type": "git", "url": "https://github.com/symfony/DependencyInjection.git", - "reference": "e8e846bae304539ba7ac5b9a8aa9094c901bc681" + "reference": "72db9adf2f6c42e773108038bcdaff263f325b4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/e8e846bae304539ba7ac5b9a8aa9094c901bc681", - "reference": "e8e846bae304539ba7ac5b9a8aa9094c901bc681", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/72db9adf2f6c42e773108038bcdaff263f325b4e", + "reference": "72db9adf2f6c42e773108038bcdaff263f325b4e", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "conflict": { + "symfony/expression-language": "<2.6" + }, "require-dev": { "symfony/config": "~2.2", - "symfony/expression-language": "~2.4", - "symfony/yaml": "~2.0" + "symfony/expression-language": "~2.6", + "symfony/yaml": "~2.1" }, "suggest": { "symfony/config": "", @@ -282,21 +285,21 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "http://symfony.com", - "time": "2014-10-26 07:46:28" + "time": "2015-01-05 17:41:06" }, { "name": "symfony/filesystem", - "version": "v2.5.6", + "version": "v2.6.3", "target-dir": "Symfony/Component/Filesystem", "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "4e62fab0060a826561c78b665925b37c870c45f5" + "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/4e62fab0060a826561c78b665925b37c870c45f5", - "reference": "4e62fab0060a826561c78b665925b37c870c45f5", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a1f566d1f92e142fa1593f4555d6d89e3044a9b7", + "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7", "shasum": "" }, "require": { @@ -305,7 +308,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -329,21 +332,21 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2014-09-22 09:14:18" + "time": "2015-01-03 21:13:09" }, { "name": "symfony/yaml", - "version": "dev-master", + "version": "v2.6.3", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "4c0baf9a5b5c9e50ddd7a46f3c75cb85baf5d6c5" + "reference": "82462a90848a52c2533aa6b598b107d68076b018" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/4c0baf9a5b5c9e50ddd7a46f3c75cb85baf5d6c5", - "reference": "4c0baf9a5b5c9e50ddd7a46f3c75cb85baf5d6c5", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/82462a90848a52c2533aa6b598b107d68076b018", + "reference": "82462a90848a52c2533aa6b598b107d68076b018", "shasum": "" }, "require": { @@ -376,7 +379,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2014-10-26 07:46:28" + "time": "2015-01-03 15:33:07" } ], "packages-dev": [], @@ -384,14 +387,10 @@ "minimum-stability": "stable", "stability-flags": { "ocpl/okapi": 20, - "symfony/dependency-injection": 20, - "symfony/yaml": 20, - "symfony/config": 20, - "ccampbell/chromephp": 20, - "html2text/html2text": 20, "iamcal/rfc822": 20 }, "prefer-stable": false, + "prefer-lowest": false, "platform": { "php": ">=5.3.0" },