Browse Source

Updating vendor libs

Julio Montoya 12 years ago
parent
commit
cab753ce46

+ 41 - 39
composer.lock

@@ -73,18 +73,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/common",
-                "reference": "d514e3920656921ba1148f16a4089222c58bc83a"
+                "reference": "a890fe1b689ed65c52bf4a7e64333a27b3c400d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/doctrine/common/archive/d514e3920656921ba1148f16a4089222c58bc83a.zip",
-                "reference": "d514e3920656921ba1148f16a4089222c58bc83a",
+                "url": "https://github.com/doctrine/common/archive/a890fe1b689ed65c52bf4a7e64333a27b3c400d6.zip",
+                "reference": "a890fe1b689ed65c52bf4a7e64333a27b3c400d6",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2"
             },
-            "time": "2012-12-05 12:03:39",
+            "time": "2012-12-18 00:45:03",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -123,7 +123,7 @@
                 {
                     "name": "Johannes Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
+                    "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -143,19 +143,19 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal",
-                "reference": "74c7616132ad82420320e76fa49781ee2f6af532"
+                "reference": "6ace93c92ebfa2411b7c763607057baf069fb0d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/doctrine/dbal/archive/74c7616132ad82420320e76fa49781ee2f6af532.zip",
-                "reference": "74c7616132ad82420320e76fa49781ee2f6af532",
+                "url": "https://github.com/doctrine/dbal/archive/6ace93c92ebfa2411b7c763607057baf069fb0d6.zip",
+                "reference": "6ace93c92ebfa2411b7c763607057baf069fb0d6",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2",
                 "doctrine/common": ">=2.3-dev,<2.5-dev"
             },
-            "time": "2012-12-11 16:41:50",
+            "time": "2012-12-17 11:53:37",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -437,12 +437,12 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/fabpot/Silex.git",
-                "reference": "c2dff3ca9e8ee4e5c9652a366c39eb3b3c91ca53"
+                "reference": "bd523d5970bb093d1d2c709e91a7f72b70c39108"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/fabpot/Silex/archive/c2dff3ca9e8ee4e5c9652a366c39eb3b3c91ca53.zip",
-                "reference": "c2dff3ca9e8ee4e5c9652a366c39eb3b3c91ca53",
+                "url": "https://github.com/fabpot/Silex/archive/bd523d5970bb093d1d2c709e91a7f72b70c39108.zip",
+                "reference": "bd523d5970bb093d1d2c709e91a7f72b70c39108",
                 "shasum": ""
             },
             "require": {
@@ -477,7 +477,7 @@
                 "symfony/css-selector": ">=2.1,<2.3-dev",
                 "symfony/dom-crawler": ">=2.1,<2.3-dev"
             },
-            "time": "2012-12-14 13:15:04",
+            "time": "2012-12-18 11:32:45",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -568,18 +568,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Config",
-                "reference": "1df5b632feb0034736000060592a742c754ef4ec"
+                "reference": "ab422ad472259c7775d70831182f586f444c77a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Config/archive/1df5b632feb0034736000060592a742c754ef4ec.zip",
-                "reference": "1df5b632feb0034736000060592a742c754ef4ec",
+                "url": "https://github.com/symfony/Config/archive/ab422ad472259c7775d70831182f586f444c77a3.zip",
+                "reference": "ab422ad472259c7775d70831182f586f444c77a3",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
-            "time": "2012-12-16 16:56:50",
+            "time": "2012-12-20 07:41:17",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -616,18 +616,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Console",
-                "reference": "92cd0e84022f31287337ab17842bbfff47d2fc79"
+                "reference": "388ea8dbc1b3e1f96721e2799eb2d037e411a281"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Console/archive/92cd0e84022f31287337ab17842bbfff47d2fc79.zip",
-                "reference": "92cd0e84022f31287337ab17842bbfff47d2fc79",
+                "url": "https://github.com/symfony/Console/archive/388ea8dbc1b3e1f96721e2799eb2d037e411a281.zip",
+                "reference": "388ea8dbc1b3e1f96721e2799eb2d037e411a281",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
-            "time": "2012-12-14 09:43:16",
+            "time": "2012-12-19 07:09:49",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -664,12 +664,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/DependencyInjection",
-                "reference": "877d4065057d55f14c148b3801f77e2cba11bb8b"
+                "reference": "32ad6cccb2c38d7ac87217fae459083438f05634"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/DependencyInjection/archive/877d4065057d55f14c148b3801f77e2cba11bb8b.zip",
-                "reference": "877d4065057d55f14c148b3801f77e2cba11bb8b",
+                "url": "https://github.com/symfony/DependencyInjection/archive/32ad6cccb2c38d7ac87217fae459083438f05634.zip",
+                "reference": "32ad6cccb2c38d7ac87217fae459083438f05634",
                 "shasum": ""
             },
             "require": {
@@ -683,7 +683,7 @@
                 "symfony/yaml": "2.2.*",
                 "symfony/config": "2.2.*"
             },
-            "time": "2012-12-16 15:11:28",
+            "time": "2012-12-19 07:09:49",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1025,12 +1025,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Routing",
-                "reference": "c259a67cf029b106048c91cd74a7a1284c321e65"
+                "reference": "eecf36850760b137fcd4f5025c64014de722874c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Routing/archive/c259a67cf029b106048c91cd74a7a1284c321e65.zip",
-                "reference": "c259a67cf029b106048c91cd74a7a1284c321e65",
+                "url": "https://github.com/symfony/Routing/archive/eecf36850760b137fcd4f5025c64014de722874c.zip",
+                "reference": "eecf36850760b137fcd4f5025c64014de722874c",
                 "shasum": ""
             },
             "require": {
@@ -1047,7 +1047,7 @@
                 "symfony/config": "2.2.*",
                 "symfony/yaml": "2.2.*"
             },
-            "time": "2012-12-14 22:50:21",
+            "time": "2012-12-20 07:41:17",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1196,12 +1196,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/TwigBridge",
-                "reference": "83952ceb104f735ffc243f0de1fc2c2101dccdad"
+                "reference": "8e744c833f1fdee779a9e747a2feb795a655d869"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/TwigBridge/archive/83952ceb104f735ffc243f0de1fc2c2101dccdad.zip",
-                "reference": "83952ceb104f735ffc243f0de1fc2c2101dccdad",
+                "url": "https://github.com/symfony/TwigBridge/archive/8e744c833f1fdee779a9e747a2feb795a655d869.zip",
+                "reference": "8e744c833f1fdee779a9e747a2feb795a655d869",
                 "shasum": ""
             },
             "require": {
@@ -1214,7 +1214,8 @@
                 "symfony/templating": "2.2.*",
                 "symfony/translation": "2.2.*",
                 "symfony/yaml": "2.2.*",
-                "symfony/security": "2.2.*"
+                "symfony/security": "2.2.*",
+                "symfony/http-kernel": "2.2.*"
             },
             "suggest": {
                 "symfony/form": "2.2.*",
@@ -1222,9 +1223,10 @@
                 "symfony/templating": "2.2.*",
                 "symfony/translation": "2.2.*",
                 "symfony/yaml": "2.2.*",
-                "symfony/security": "2.2.*"
+                "symfony/security": "2.2.*",
+                "symfony/http-kernel": "2.2.*"
             },
-            "time": "2012-12-16 13:02:47",
+            "time": "2012-12-20 07:31:14",
             "type": "symfony-bridge",
             "extra": {
                 "branch-alias": {
@@ -1356,18 +1358,18 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/fabpot/Twig.git",
-                "reference": "6c01c14fd8f42348a032148ebecb6e034e9e18bd"
+                "reference": "f095f3a1777431412954e478f92e8a10cb7b6495"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/fabpot/Twig/archive/6c01c14fd8f42348a032148ebecb6e034e9e18bd.zip",
-                "reference": "6c01c14fd8f42348a032148ebecb6e034e9e18bd",
+                "url": "https://github.com/fabpot/Twig/archive/f095f3a1777431412954e478f92e8a10cb7b6495.zip",
+                "reference": "f095f3a1777431412954e478f92e8a10cb7b6495",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.4"
             },
-            "time": "2012-12-16 07:55:06",
+            "time": "2012-12-18 10:01:32",
             "type": "library",
             "extra": {
                 "branch-alias": {

+ 8 - 3
main/inc/global.inc.php

@@ -464,15 +464,20 @@ if (file_exists($mail_conf)) {
 	require_once $mail_conf;
 }
 
-$app->register(new Silex\Provider\SwiftmailerServiceProvider(), array(
-     'swiftmailer.options' => array(
+$mail_settings = array();
+
+if (isset($platform_email['SMTP_MAILER']) && $platform_email['SMTP_MAILER'] == 'smtp') {
+    $mail_settings = array(
         'host' => $platform_email['SMTP_HOST'],
         'port' => $platform_email['SMTP_PORT'],
         'username' => $platform_email['SMTP_USER'],
         'password' => $platform_email['SMTP_PASS'],
         'encryption' => null,
         'auth_mode' => null
-    ),
+    );
+}
+$app->register(new Silex\Provider\SwiftmailerServiceProvider(), array(
+     'swiftmailer.options' => $mail_settings
 ));
 
 // check and modify the date of user in the track.e.online table

+ 1 - 1
vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit5a316567ec2c31bac16293a95977788b::getLoader();
+return ComposerAutoloaderInit45c6d425db4ffdbf3029a52ecf48273e::getLoader();

+ 0 - 1
vendor/composer/autoload_classmap.php

@@ -545,7 +545,6 @@ return array(
     'ImsItem' => $baseDir . '/main/exercice/export/qti2/qti2_export.php',
     'ImsQuestion' => $baseDir . '/main/exercice/export/qti/qti_classes.php',
     'ImsSection' => $baseDir . '/main/exercice/export/qti2/qti2_export.php',
-    'IndexManager' => $baseDir . '/main/inc/lib/userportal.lib.php',
     'IndexableChunk' => $baseDir . '/main/inc/lib/search/IndexableChunk.class.php',
     'Inline_Frame_Decorator' => $baseDir . '/main/inc/lib/phpdocx/pdf/include/inline_frame_decorator.cls.php',
     'Inline_Frame_Reflower' => $baseDir . '/main/inc/lib/phpdocx/pdf/include/inline_frame_reflower.cls.php',

+ 3 - 3
vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php generated by Composer
 
-class ComposerAutoloaderInit5a316567ec2c31bac16293a95977788b
+class ComposerAutoloaderInit45c6d425db4ffdbf3029a52ecf48273e
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit5a316567ec2c31bac16293a95977788b
             return static::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit5a316567ec2c31bac16293a95977788b', 'loadClassLoader'));
+        spl_autoload_register(array('ComposerAutoloaderInit45c6d425db4ffdbf3029a52ecf48273e', 'loadClassLoader'));
         static::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit5a316567ec2c31bac16293a95977788b', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit45c6d425db4ffdbf3029a52ecf48273e', 'loadClassLoader'));
 
         $vendorDir = dirname(__DIR__);
         $baseDir = dirname($vendorDir);

File diff suppressed because it is too large
+ 390 - 511
vendor/composer/installed.json


Some files were not shown because too many files changed in this diff