diff --git a/composer.json b/composer.json index d056068fd8..2236420741 100755 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "chamilo/chamilo-lms", "type": "project", - "homepage": "www.chamilo.org", + "homepage": "http://www.chamilo.org", "license": "GPL-3.0", "support": { "forum": "http://www.chamilo.org/forum", @@ -35,10 +35,6 @@ { "type": "vcs", "url": "https://github.com/jmontoyaa/silex-pagerfanta-provider" - }, - { - "type": "vcs", - "url": "https://github.com/ThePixelDeveloper/ConsoleServiceProvider" } ], "require": { @@ -54,6 +50,9 @@ "symfony/translation": "~2.3", "symfony/dependency-injection": "~2.3", "monolog/monolog" : ">=1.0.0", + "symfony/config": "~2.3", + "symfony/yaml": "~2.3", + "symfony/locale": "~2.3", "twig/twig": ">=1.8,<2.0-dev", "dflydev/doctrine-orm-service-provider": "1.0.*@dev", "doctrine/migrations": "dev-master", @@ -62,7 +61,7 @@ "swiftmailer/swiftmailer": ">=4.1.2,<4.2-dev", "pagerfanta/pagerfanta": "dev-master", "franmomu/silex-pagerfanta-provider": "2.3.*@dev", - "igorw/config-service-provider": "1.0.*@dev", + "igorw/config-service-provider": "1.2.*@dev", "mpdf/mpdf": "v5.6.1", "ezyang/htmlpurifier": "v4.5.0", "realityking/pchart": "dev-master", diff --git a/composer.lock b/composer.lock index a31f127abe..370a5f4bcc 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "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" ], - "hash": "58d73dfb3014105475e16c5f520fe4cd", + "hash": "b680b8d12a37364d317894421b4f9d04", "packages": [ { "name": "bt51/gaufrette-serviceprovider", @@ -58,18 +58,18 @@ "source": { "type": "git", "url": "https://github.com/chamilo/chash.git", - "reference": "bd251168e9e7ea01c7da0cef67708c0bdec550bf" + "reference": "0720bc4ab428494465ac6bab6532cb167704183f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chamilo/chash/zipball/bd251168e9e7ea01c7da0cef67708c0bdec550bf", - "reference": "bd251168e9e7ea01c7da0cef67708c0bdec550bf", + "url": "https://api.github.com/repos/chamilo/chash/zipball/0720bc4ab428494465ac6bab6532cb167704183f", + "reference": "0720bc4ab428494465ac6bab6532cb167704183f", "shasum": "" }, "require": { "php": ">=5.3.2", - "symfony/console": "2.3.*@dev", - "symfony/yaml": "2.1.*" + "symfony/console": ">=2.3,<3.0", + "symfony/yaml": ">=2.3,<3.0" }, "type": "library", "autoload": { @@ -78,7 +78,8 @@ } }, "notification-url": "https://packagist.org/downloads/", - "time": "2013-06-10 13:35:04" + "homepage": "http://www.chamilo.org", + "time": "2013-06-14 09:54:38" }, { "name": "dflydev/doctrine-orm-service-provider", @@ -198,9 +199,9 @@ "email": "kontakt@beberlei.de" }, { - "name": "Johannes M. Schmitt", + "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", + "homepage": "http://jmsyst.com", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -626,32 +627,34 @@ }, { "name": "igorw/config-service-provider", - "version": "v1.0.0", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/igorw/ConfigServiceProvider", - "reference": "v1.0.0" + "url": "https://github.com/igorw/ConfigServiceProvider.git", + "reference": "v1.2.1" }, "dist": { "type": "zip", - "url": "https://github.com/igorw/ConfigServiceProvider/archive/v1.0.0.zip", - "reference": "v1.0.0", + "url": "https://api.github.com/repos/igorw/ConfigServiceProvider/zipball/v1.2.1", + "reference": "v1.2.1", "shasum": "" }, "require": { - "silex/silex": "1.0.*@dev" + "silex/silex": ">=1.0,<2.0" }, "require-dev": { - "symfony/yaml": "2.1.*@dev" + "jamesmoss/toml": ">=0.1,<1.0", + "symfony/yaml": ">=2.1,<3.0" }, "suggest": { - "symfony/yaml": "2.1.*" + "jamesmoss/toml": "~0.1", + "symfony/yaml": "~2.1" }, "type": "library", "extra": { - "branch-alias": [ - - ] + "branch-alias": { + "dev-master": "1.2-dev" + } }, "autoload": { "psr-0": { @@ -673,11 +676,11 @@ "homepage": "https://github.com/igorw/ConfigServiceProvider/contributors" } ], - "description": "A JSON/Yaml-based config ServiceProvider for Silex.", + "description": "A config ServiceProvider for Silex with support for php, json and yaml.", "keywords": [ "silex" ], - "time": "2012-07-13 17:12:34" + "time": "2013-05-31 14:23:34" }, { "name": "imagine/imagine", @@ -762,7 +765,8 @@ { "name": "Johnny Broadway", "email": "johnny@johnnybroadway.com", - "homepage": "http://www.johnnybroadway.com/" + "homepage": "http://www.johnnybroadway.com/", + "role": "Main Developer" } ], "description": "PHP port of URLify.js from the Django project. Transliterates non-ascii characters for use in URLs.", @@ -827,18 +831,18 @@ "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/ThePixelDeveloper/ConsoleServiceProvider.git", - "reference": "ba7d78060a1f6689082b35b5b4f5a4891b48a36c" + "url": "https://github.com/KnpLabs/ConsoleServiceProvider.git", + "reference": "1f1a3315409814d01702a47a8823549c6996de41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ThePixelDeveloper/ConsoleServiceProvider/zipball/ba7d78060a1f6689082b35b5b4f5a4891b48a36c", - "reference": "ba7d78060a1f6689082b35b5b4f5a4891b48a36c", + "url": "https://api.github.com/repos/KnpLabs/ConsoleServiceProvider/zipball/1f1a3315409814d01702a47a8823549c6996de41", + "reference": "1f1a3315409814d01702a47a8823549c6996de41", "shasum": "" }, "require": { "php": ">=5.3.2", - "symfony/console": "~2.1" + "symfony/console": ">=2.1,<3.0" }, "type": "library", "autoload": { @@ -846,6 +850,7 @@ "Knp\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -861,10 +866,7 @@ "console", "silex" ], - "support": { - "source": "https://github.com/ThePixelDeveloper/ConsoleServiceProvider/tree/master" - }, - "time": "2013-02-10 13:15:07" + "time": "2013-06-13 12:43:39" }, { "name": "knplabs/gaufrette", @@ -989,7 +991,7 @@ "email": "stof@notk.org" }, { - "name": "Knplabs", + "name": "KnpLabs", "homepage": "http://knplabs.com" }, { @@ -1213,12 +1215,12 @@ "source": { "type": "git", "url": "https://github.com/whiteoctober/Pagerfanta.git", - "reference": "55544f3af5b409d4ee9d618934f4d92ef874672c" + "reference": "1a3cb8addb92df6396e59a2c44c3b7f216b4218a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/55544f3af5b409d4ee9d618934f4d92ef874672c", - "reference": "55544f3af5b409d4ee9d618934f4d92ef874672c", + "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/1a3cb8addb92df6396e59a2c44c3b7f216b4218a", + "reference": "1a3cb8addb92df6396e59a2c44c3b7f216b4218a", "shasum": "" }, "require": { @@ -1267,7 +1269,7 @@ "paginator", "paging" ], - "time": "2013-05-16 12:46:53" + "time": "2013-06-13 22:25:28" }, { "name": "pimple/pimple", @@ -1518,19 +1520,67 @@ ], "time": "2012-06-17 13:55:34" }, + { + "name": "symfony/config", + "version": "v2.3.1", + "target-dir": "Symfony/Component/Config", + "source": { + "type": "git", + "url": "https://github.com/symfony/Config.git", + "reference": "v2.3.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Config/zipball/v2.3.1", + "reference": "v2.3.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/filesystem": ">=2.3,<3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Config\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Config Component", + "homepage": "http://symfony.com", + "time": "2013-06-03 00:18:25" + }, { "name": "symfony/console", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "v2.3.0" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/v2.3.0", - "reference": "v2.3.0", + "url": "https://api.github.com/repos/symfony/Console/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -1569,21 +1619,21 @@ ], "description": "Symfony Console Component", "homepage": "http://symfony.com", - "time": "2013-05-30 05:11:26" + "time": "2013-06-11 07:15:14" }, { "name": "symfony/debug", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/Debug", "source": { "type": "git", "url": "https://github.com/symfony/Debug.git", - "reference": "v2.3.0" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/v2.3.0", - "reference": "v2.3.0", + "url": "https://api.github.com/repos/symfony/Debug/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -1629,17 +1679,17 @@ }, { "name": "symfony/dependency-injection", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/DependencyInjection", "source": { "type": "git", "url": "https://github.com/symfony/DependencyInjection.git", - "reference": "v2.3.0-RC1" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.3.0-RC1", - "reference": "v2.3.0-RC1", + "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -1681,7 +1731,7 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "http://symfony.com", - "time": "2013-05-13 14:36:40" + "time": "2013-06-05 09:51:05" }, { "name": "symfony/doctrine-bridge", @@ -1805,17 +1855,17 @@ }, { "name": "symfony/filesystem", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/Filesystem", "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "v2.3.0-RC1" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.3.0-RC1", - "reference": "v2.3.0-RC1", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -1848,21 +1898,21 @@ ], "description": "Symfony Filesystem Component", "homepage": "http://symfony.com", - "time": "2013-05-06 20:03:44" + "time": "2013-06-04 15:02:05" }, { "name": "symfony/form", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/Form", "source": { "type": "git", "url": "https://github.com/symfony/Form.git", - "reference": "v2.3.0" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Form/zipball/v2.3.0", - "reference": "v2.3.0", + "url": "https://api.github.com/repos/symfony/Form/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -1911,17 +1961,17 @@ }, { "name": "symfony/http-foundation", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "v2.3.0-RC1" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.3.0-RC1", - "reference": "v2.3.0-RC1", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -2079,17 +2129,17 @@ }, { "name": "symfony/intl", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/Intl", "source": { "type": "git", "url": "https://github.com/symfony/Intl.git", - "reference": "v2.3.0" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Intl/zipball/v2.3.0", - "reference": "v2.3.0", + "url": "https://api.github.com/repos/symfony/Intl/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -2154,19 +2204,67 @@ ], "time": "2013-05-18 11:21:22" }, + { + "name": "symfony/locale", + "version": "v2.3.1", + "target-dir": "Symfony/Component/Locale", + "source": { + "type": "git", + "url": "https://github.com/symfony/Locale.git", + "reference": "v2.3.1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Locale/zipball/v2.3.1", + "reference": "v2.3.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/intl": ">=2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Locale\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Locale Component", + "homepage": "http://symfony.com", + "time": "2013-04-11 09:29:25" + }, { "name": "symfony/options-resolver", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/OptionsResolver", "source": { "type": "git", "url": "https://github.com/symfony/OptionsResolver.git", - "reference": "v2.3.0-RC1" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/OptionsResolver/zipball/v2.3.0-RC1", - "reference": "v2.3.0-RC1", + "url": "https://api.github.com/repos/symfony/OptionsResolver/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -2213,12 +2311,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/PropertyAccess.git", - "reference": "v2.3.0-RC1" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/PropertyAccess/zipball/v2.3.0-RC1", - "reference": "v2.3.0-RC1", + "url": "https://api.github.com/repos/symfony/PropertyAccess/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -2324,17 +2422,17 @@ }, { "name": "symfony/security", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/Security", "source": { "type": "git", "url": "https://github.com/symfony/Security.git", - "reference": "v2.3.0" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Security/zipball/v2.3.0", - "reference": "v2.3.0", + "url": "https://api.github.com/repos/symfony/Security/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -2388,7 +2486,7 @@ ], "description": "Symfony Security Component", "homepage": "http://symfony.com", - "time": "2013-05-27 14:49:21" + "time": "2013-06-02 22:50:02" }, { "name": "symfony/translation", @@ -2447,17 +2545,17 @@ }, { "name": "symfony/twig-bridge", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Bridge/Twig", "source": { "type": "git", "url": "https://github.com/symfony/TwigBridge.git", - "reference": "v2.3.0-RC1" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/v2.3.0-RC1", - "reference": "v2.3.0-RC1", + "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -2513,17 +2611,17 @@ }, { "name": "symfony/validator", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/Validator", "source": { "type": "git", "url": "https://github.com/symfony/Validator.git", - "reference": "v2.3.0" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Validator/zipball/v2.3.0", - "reference": "v2.3.0", + "url": "https://api.github.com/repos/symfony/Validator/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -2570,30 +2668,35 @@ ], "description": "Symfony Validator Component", "homepage": "http://symfony.com", - "time": "2013-06-02 12:05:51" + "time": "2013-06-10 16:23:25" }, { "name": "symfony/yaml", - "version": "v2.1.11", + "version": "v2.3.1", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "v2.1.11" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.1.11", - "reference": "v2.1.11", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, "autoload": { "psr-0": { - "Symfony\\Component\\Yaml": "" + "Symfony\\Component\\Yaml\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -2612,7 +2715,7 @@ ], "description": "Symfony Yaml Component", "homepage": "http://symfony.com", - "time": "2013-05-10 00:09:46" + "time": "2013-05-10 18:12:13" }, { "name": "twig/twig", @@ -2984,12 +3087,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/BrowserKit.git", - "reference": "v2.3.0-RC1" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.3.0-RC1", - "reference": "v2.3.0-RC1", + "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -3034,17 +3137,17 @@ }, { "name": "symfony/dom-crawler", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/DomCrawler", "source": { "type": "git", "url": "https://github.com/symfony/DomCrawler.git", - "reference": "v2.3.0" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.3.0", - "reference": "v2.3.0", + "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -3083,7 +3186,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "http://symfony.com", - "time": "2013-05-19 19:00:48" + "time": "2013-06-11 07:15:14" }, { "name": "symfony/finder", @@ -3134,17 +3237,17 @@ }, { "name": "symfony/process", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/Process", "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "v2.3.0-RC1" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/v2.3.0-RC1", - "reference": "v2.3.0-RC1", + "url": "https://api.github.com/repos/symfony/Process/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -3181,17 +3284,17 @@ }, { "name": "symfony/stopwatch", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Component/Stopwatch", "source": { "type": "git", "url": "https://github.com/symfony/Stopwatch.git", - "reference": "v2.3.0-RC1" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/v2.3.0-RC1", - "reference": "v2.3.0-RC1", + "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": { @@ -3228,17 +3331,17 @@ }, { "name": "symfony/web-profiler-bundle", - "version": "v2.3.0", + "version": "v2.3.1", "target-dir": "Symfony/Bundle/WebProfilerBundle", "source": { "type": "git", "url": "https://github.com/symfony/WebProfilerBundle.git", - "reference": "v2.3.0" + "reference": "v2.3.1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/WebProfilerBundle/zipball/v2.3.0", - "reference": "v2.3.0", + "url": "https://api.github.com/repos/symfony/WebProfilerBundle/zipball/v2.3.1", + "reference": "v2.3.1", "shasum": "" }, "require": {