Selaa lähdekoodia

Moving announcements classes inside the main/inc/lib, updating autoloader

Julio Montoya 12 vuotta sitten
vanhempi
commit
464513bb73

+ 20 - 20
composer.lock

@@ -643,12 +643,12 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/l3pp4rd/DoctrineExtensions.git",
-                "reference": "0d4393d25a0ff6074b5163311e058d7f3cbccf35"
+                "reference": "8b76f310b038647c85ae17143971b0c2abbd0a57"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/l3pp4rd/DoctrineExtensions/archive/0d4393d25a0ff6074b5163311e058d7f3cbccf35.zip",
-                "reference": "0d4393d25a0ff6074b5163311e058d7f3cbccf35",
+                "url": "https://github.com/l3pp4rd/DoctrineExtensions/archive/8b76f310b038647c85ae17143971b0c2abbd0a57.zip",
+                "reference": "8b76f310b038647c85ae17143971b0c2abbd0a57",
                 "shasum": ""
             },
             "require": {
@@ -668,7 +668,7 @@
                 "doctrine/mongodb": ">=1.0.0",
                 "doctrine/mongodb-odm": ">=1.0.0-BETA7"
             },
-            "time": "2013-01-11 05:15:19",
+            "time": "2013-01-16 05:01:32",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -968,12 +968,12 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/fabpot/Silex.git",
-                "reference": "c3dc8d7e0fba4a2858dc2099066f7e593bee2045"
+                "reference": "3d5d39ea73ef1fa8366957e96fa9204805d7cac6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/fabpot/Silex/archive/c3dc8d7e0fba4a2858dc2099066f7e593bee2045.zip",
-                "reference": "c3dc8d7e0fba4a2858dc2099066f7e593bee2045",
+                "url": "https://github.com/fabpot/Silex/archive/3d5d39ea73ef1fa8366957e96fa9204805d7cac6.zip",
+                "reference": "3d5d39ea73ef1fa8366957e96fa9204805d7cac6",
                 "shasum": ""
             },
             "require": {
@@ -1008,7 +1008,7 @@
                 "symfony/css-selector": ">=2.1,<2.3-dev",
                 "symfony/dom-crawler": ">=2.1,<2.3-dev"
             },
-            "time": "2013-01-13 19:52:32",
+            "time": "2013-01-15 13:27:32",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1191,12 +1191,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/DependencyInjection",
-                "reference": "c4016466a8632f27d72d4ecfc89b472d4050a2ca"
+                "reference": "b5fa8c4627840d22a13def4be4f3383ddd992aa1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/DependencyInjection/archive/c4016466a8632f27d72d4ecfc89b472d4050a2ca.zip",
-                "reference": "c4016466a8632f27d72d4ecfc89b472d4050a2ca",
+                "url": "https://github.com/symfony/DependencyInjection/archive/b5fa8c4627840d22a13def4be4f3383ddd992aa1.zip",
+                "reference": "b5fa8c4627840d22a13def4be4f3383ddd992aa1",
                 "shasum": ""
             },
             "require": {
@@ -1210,7 +1210,7 @@
                 "symfony/yaml": "2.2.*",
                 "symfony/config": "2.2.*"
             },
-            "time": "2013-01-11 17:38:19",
+            "time": "2013-01-16 08:59:03",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1545,12 +1545,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Routing",
-                "reference": "192243b2c5e36fc21e83fd63ab54582dcc31e7e4"
+                "reference": "81b5a5649b8b1fba057f3fdd5ca15cc3af822b66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/symfony/Routing/archive/192243b2c5e36fc21e83fd63ab54582dcc31e7e4.zip",
-                "reference": "192243b2c5e36fc21e83fd63ab54582dcc31e7e4",
+                "url": "https://github.com/symfony/Routing/archive/81b5a5649b8b1fba057f3fdd5ca15cc3af822b66.zip",
+                "reference": "81b5a5649b8b1fba057f3fdd5ca15cc3af822b66",
                 "shasum": ""
             },
             "require": {
@@ -1568,7 +1568,7 @@
                 "symfony/config": "2.2.*",
                 "symfony/yaml": "2.2.*"
             },
-            "time": "2013-01-11 17:38:19",
+            "time": "2013-01-15 17:01:40",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1873,18 +1873,18 @@
             "source": {
                 "type": "git",
                 "url": "git://github.com/fabpot/Twig.git",
-                "reference": "3111e1265db1026323c589a5bd2d152871d7bbab"
+                "reference": "3225226e0be466395414da4b362013531eedb580"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/fabpot/Twig/archive/3111e1265db1026323c589a5bd2d152871d7bbab.zip",
-                "reference": "3111e1265db1026323c589a5bd2d152871d7bbab",
+                "url": "https://github.com/fabpot/Twig/archive/3225226e0be466395414da4b362013531eedb580.zip",
+                "reference": "3225226e0be466395414da4b362013531eedb580",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.2.4"
             },
-            "time": "2013-01-08 16:56:12",
+            "time": "2013-01-16 13:37:25",
             "type": "library",
             "extra": {
                 "branch-alias": {

+ 0 - 1
main/announcements/announcements.php

@@ -63,7 +63,6 @@ $lib = api_get_path(LIBRARY_PATH); //avoid useless function calls
 require_once $lib.'tracking.lib.php';
 require_once $lib.'fckeditor/fckeditor.php';
 require_once $lib.'fileUpload.lib.php';
-require_once 'announcements.inc.php';
 
 $course_id = api_get_course_int_id();
 

+ 0 - 0
main/announcements/announcement_email.class.php → main/inc/lib/announcement_email.class.php


+ 2 - 2
main/announcements/announcements.inc.php → main/inc/lib/announcements.inc.php

@@ -932,7 +932,7 @@ class AnnouncementManager {
     public static function separate_users_groups($to) {
         $grouplist = array();
         $userlist = array();
-        
+
         foreach ($to as $to_item) {
             list($type, $id) = explode(':', $to_item);
             switch ($type) {
@@ -1120,7 +1120,7 @@ class AnnouncementManager {
         $id = intval($id);
         $course_id = api_get_course_int_id();
         $sql = "DELETE FROM $tbl_announcement_attachment WHERE c_id = $course_id AND id = $id";
-        $result = Database::query($sql);
+        Database::query($sql);
         // update item_property
         //api_item_property_update($_course, 'announcement_attachment',  $id,'AnnouncementAttachmentDeleted', api_get_user_id());
     }

+ 0 - 1
main/social/profile.php

@@ -59,7 +59,6 @@ if (isset($_GET['u'])) {
 }
 $libpath = api_get_path(LIBRARY_PATH);
 require_once api_get_path(SYS_CODE_PATH).'calendar/myagenda.inc.php';
-require_once api_get_path(SYS_CODE_PATH).'announcements/announcements.inc.php';
 
 require_once $libpath.'magpierss/rss_fetch.inc';
 $ajax_url = api_get_path(WEB_AJAX_PATH).'message.ajax.php';

+ 8 - 13
main/webservices/cm_webservice_announcements.php

@@ -2,11 +2,6 @@
 
 require_once(dirname(__FILE__).'/../inc/global.inc.php');
 $libpath = api_get_path(LIBRARY_PATH);
-
-require_once(dirname(__FILE__).'/../announcements/announcements.inc.php');
-require_once $libpath.'usermanager.lib.php';
-require_once $libpath.'course.lib.php';
-require_once $libpath.'groupmanager.lib.php';
 require_once(dirname(__FILE__).'/cm_webservice.php');
 
 
@@ -16,11 +11,11 @@ require_once(dirname(__FILE__).'/cm_webservice.php');
  * @author marcosousa
  */
 class WSCMAnnouncements extends WSCM {
-    
+
     public function get_announcements_id($username, $password, $course_code)
-    { 
+    {
         if($this->verifyUserPass($username, $password) == "valid")
-        { 
+        {
 
             $result = self::get_announcements($username, $course_code);
 
@@ -36,7 +31,7 @@ class WSCMAnnouncements extends WSCM {
     }
 
     public function get_announcement_data($username, $password, $course_code, $announcement_id, $field)
-    { 
+    {
         if($this->verifyUserPass($username, $password) == "valid")
         {
             $htmlcode = false;
@@ -87,11 +82,11 @@ class WSCMAnnouncements extends WSCM {
 
             $announcement_id = ($announcement_id == 0) ? "" : "AND announcement.id=".$announcement_id;
             $user_id = UserManager::get_user_id_from_username($username);
-  
+
             //$listOfCourses = CourseManager::get_course_information_by_id($course_id);
-            
+
             $course_info = CourseManager::get_course_information($course_code);
-  
+
             $course_db = $course_info['db_name'];
 
             $tbl_item_property  	= Database::get_course_table(TABLE_ITEM_PROPERTY, $course_db);
@@ -168,7 +163,7 @@ class WSCMAnnouncements extends WSCM {
                                     LIMIT 0,$maximum";
                     }
             }
-            
+
             $result = Database::query($sql);
             return $result;
     }

+ 0 - 1
tests/main/announcements/announcements.inc.test.php

@@ -1,7 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-require_once api_get_path(SYS_CODE_PATH).'announcements/announcements.inc.php';
 require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
 

+ 1 - 1
vendor/autoload.php

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

+ 2 - 0
vendor/composer/autoload_classmap.php

@@ -23,6 +23,8 @@ return array(
     'AdminPage' => $baseDir . '/main/admin/admin_page.class.php',
     'AjaxController' => $baseDir . '/main/inc/lib/ajax_controller.class.php',
     'Announcement' => $baseDir . '/main/coursecopy/classes/Announcement.class.php',
+    'AnnouncementEmail' => $baseDir . '/main/inc/lib/announcement_email.class.php',
+    'AnnouncementManager' => $baseDir . '/main/inc/lib/announcements.inc.php',
     'Answer' => $baseDir . '/main/exercice/answer.class.php',
     'AppPlugin' => $baseDir . '/main/inc/lib/plugin.lib.php',
     'AssetAggregatedRenderer' => $baseDir . '/main/inc/lib/system/media/renderer/asset_aggregated_renderer.class.php',

+ 3 - 3
vendor/composer/autoload_real.php

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

+ 244 - 244
vendor/composer/installed.json

@@ -138,57 +138,6 @@
             "psr-3"
         ]
     },
-    {
-        "name": "twig/twig",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "source": {
-            "type": "git",
-            "url": "git://github.com/fabpot/Twig.git",
-            "reference": "3111e1265db1026323c589a5bd2d152871d7bbab"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://github.com/fabpot/Twig/archive/3111e1265db1026323c589a5bd2d152871d7bbab.zip",
-            "reference": "3111e1265db1026323c589a5bd2d152871d7bbab",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.2.4"
-        },
-        "time": "2013-01-08 16:56:12",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.12-dev"
-            }
-        },
-        "installation-source": "source",
-        "autoload": {
-            "psr-0": {
-                "Twig_": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3"
-        ],
-        "authors": [
-            {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Armin Ronacher",
-                "email": "armin.ronacher@active-4.com"
-            }
-        ],
-        "description": "Twig, the flexible, fast, and secure template language for PHP",
-        "homepage": "http://twig.sensiolabs.org",
-        "keywords": [
-            "templating"
-        ]
-    },
     {
         "name": "symfony/http-foundation",
         "version": "2.1.x-dev",
@@ -1009,77 +958,6 @@
             "pluarlize"
         ]
     },
-    {
-        "name": "gedmo/doctrine-extensions",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "source": {
-            "type": "git",
-            "url": "git://github.com/l3pp4rd/DoctrineExtensions.git",
-            "reference": "0d4393d25a0ff6074b5163311e058d7f3cbccf35"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://github.com/l3pp4rd/DoctrineExtensions/archive/0d4393d25a0ff6074b5163311e058d7f3cbccf35.zip",
-            "reference": "0d4393d25a0ff6074b5163311e058d7f3cbccf35",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.2",
-            "doctrine/common": ">=2.2,<2.5-dev"
-        },
-        "require-dev": {
-            "doctrine/mongodb": ">=1.0.0-BETA1",
-            "doctrine/mongodb-odm": ">=1.0.0-BETA6",
-            "doctrine/orm": ">=2.2",
-            "doctrine/dbal": ">=2.2",
-            "symfony/yaml": "2.*"
-        },
-        "suggest": {
-            "doctrine/orm": ">=2.2",
-            "doctrine/dbal": ">=2.2",
-            "doctrine/mongodb": ">=1.0.0",
-            "doctrine/mongodb-odm": ">=1.0.0-BETA7"
-        },
-        "time": "2013-01-11 05:15:19",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.3.x-dev"
-            }
-        },
-        "installation-source": "source",
-        "autoload": {
-            "psr-0": {
-                "Gedmo": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Gediminas Morkevicius",
-                "email": "gediminas.morkevicius@gmail.com"
-            }
-        ],
-        "description": "Doctrine2 behavioral extensions",
-        "homepage": "http://gediminasm.org/",
-        "keywords": [
-            "tree",
-            "behaviors",
-            "doctrine2",
-            "extensions",
-            "gedmo",
-            "sluggable",
-            "loggable",
-            "translatable",
-            "nestedset",
-            "sortable",
-            "timestampable"
-        ]
-    },
     {
         "name": "doctrine/lexer",
         "version": "v1.0",
@@ -1401,63 +1279,6 @@
             "queryobject"
         ]
     },
-    {
-        "name": "symfony/dependency-injection",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "target-dir": "Symfony/Component/DependencyInjection",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/DependencyInjection",
-            "reference": "c4016466a8632f27d72d4ecfc89b472d4050a2ca"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://github.com/symfony/DependencyInjection/archive/c4016466a8632f27d72d4ecfc89b472d4050a2ca.zip",
-            "reference": "c4016466a8632f27d72d4ecfc89b472d4050a2ca",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "require-dev": {
-            "symfony/yaml": "2.2.*",
-            "symfony/config": "2.2.*"
-        },
-        "suggest": {
-            "symfony/yaml": "2.2.*",
-            "symfony/config": "2.2.*"
-        },
-        "time": "2013-01-11 17:38:19",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.2-dev"
-            }
-        },
-        "installation-source": "source",
-        "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\DependencyInjection\\": ""
-            }
-        },
-        "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 DependencyInjection Component",
-        "homepage": "http://symfony.com"
-    },
     {
         "name": "symfony/locale",
         "version": "2.1.x-dev",
@@ -1560,67 +1381,6 @@
         "description": "Symfony Form Component",
         "homepage": "http://symfony.com"
     },
-    {
-        "name": "symfony/routing",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "target-dir": "Symfony/Component/Routing",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/Routing",
-            "reference": "192243b2c5e36fc21e83fd63ab54582dcc31e7e4"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://github.com/symfony/Routing/archive/192243b2c5e36fc21e83fd63ab54582dcc31e7e4.zip",
-            "reference": "192243b2c5e36fc21e83fd63ab54582dcc31e7e4",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "require-dev": {
-            "doctrine/common": ">=2.2,<2.4-dev",
-            "symfony/config": "2.2.*",
-            "symfony/yaml": "2.2.*",
-            "symfony/http-kernel": "2.2.*",
-            "psr/log": ">=1.0,<2.0"
-        },
-        "suggest": {
-            "doctrine/common": ">=2.2,<2.4-dev",
-            "symfony/config": "2.2.*",
-            "symfony/yaml": "2.2.*"
-        },
-        "time": "2013-01-11 17:38:19",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.2-dev"
-            }
-        },
-        "installation-source": "source",
-        "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\Routing\\": ""
-            }
-        },
-        "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 Routing Component",
-        "homepage": "http://symfony.com"
-    },
     {
         "name": "doctrine/common",
         "version": "dev-master",
@@ -1901,6 +1661,246 @@
             "psr-3"
         ]
     },
+    {
+        "name": "twig/twig",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "source": {
+            "type": "git",
+            "url": "git://github.com/fabpot/Twig.git",
+            "reference": "3225226e0be466395414da4b362013531eedb580"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://github.com/fabpot/Twig/archive/3225226e0be466395414da4b362013531eedb580.zip",
+            "reference": "3225226e0be466395414da4b362013531eedb580",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.2.4"
+        },
+        "time": "2013-01-16 13:37:25",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.12-dev"
+            }
+        },
+        "installation-source": "source",
+        "autoload": {
+            "psr-0": {
+                "Twig_": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Armin Ronacher",
+                "email": "armin.ronacher@active-4.com"
+            }
+        ],
+        "description": "Twig, the flexible, fast, and secure template language for PHP",
+        "homepage": "http://twig.sensiolabs.org",
+        "keywords": [
+            "templating"
+        ]
+    },
+    {
+        "name": "gedmo/doctrine-extensions",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "source": {
+            "type": "git",
+            "url": "git://github.com/l3pp4rd/DoctrineExtensions.git",
+            "reference": "8b76f310b038647c85ae17143971b0c2abbd0a57"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://github.com/l3pp4rd/DoctrineExtensions/archive/8b76f310b038647c85ae17143971b0c2abbd0a57.zip",
+            "reference": "8b76f310b038647c85ae17143971b0c2abbd0a57",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.2",
+            "doctrine/common": ">=2.2,<2.5-dev"
+        },
+        "require-dev": {
+            "doctrine/mongodb": ">=1.0.0-BETA1",
+            "doctrine/mongodb-odm": ">=1.0.0-BETA6",
+            "doctrine/orm": ">=2.2",
+            "doctrine/dbal": ">=2.2",
+            "symfony/yaml": "2.*"
+        },
+        "suggest": {
+            "doctrine/orm": ">=2.2",
+            "doctrine/dbal": ">=2.2",
+            "doctrine/mongodb": ">=1.0.0",
+            "doctrine/mongodb-odm": ">=1.0.0-BETA7"
+        },
+        "time": "2013-01-16 05:01:32",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.3.x-dev"
+            }
+        },
+        "installation-source": "source",
+        "autoload": {
+            "psr-0": {
+                "Gedmo": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Gediminas Morkevicius",
+                "email": "gediminas.morkevicius@gmail.com"
+            }
+        ],
+        "description": "Doctrine2 behavioral extensions",
+        "homepage": "http://gediminasm.org/",
+        "keywords": [
+            "tree",
+            "behaviors",
+            "doctrine2",
+            "extensions",
+            "gedmo",
+            "sluggable",
+            "loggable",
+            "translatable",
+            "nestedset",
+            "sortable",
+            "timestampable"
+        ]
+    },
+    {
+        "name": "symfony/dependency-injection",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "target-dir": "Symfony/Component/DependencyInjection",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/DependencyInjection",
+            "reference": "b5fa8c4627840d22a13def4be4f3383ddd992aa1"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://github.com/symfony/DependencyInjection/archive/b5fa8c4627840d22a13def4be4f3383ddd992aa1.zip",
+            "reference": "b5fa8c4627840d22a13def4be4f3383ddd992aa1",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "symfony/yaml": "2.2.*",
+            "symfony/config": "2.2.*"
+        },
+        "suggest": {
+            "symfony/yaml": "2.2.*",
+            "symfony/config": "2.2.*"
+        },
+        "time": "2013-01-16 08:59:03",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.2-dev"
+            }
+        },
+        "installation-source": "source",
+        "autoload": {
+            "psr-0": {
+                "Symfony\\Component\\DependencyInjection\\": ""
+            }
+        },
+        "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 DependencyInjection Component",
+        "homepage": "http://symfony.com"
+    },
+    {
+        "name": "symfony/routing",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "target-dir": "Symfony/Component/Routing",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/Routing",
+            "reference": "81b5a5649b8b1fba057f3fdd5ca15cc3af822b66"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://github.com/symfony/Routing/archive/81b5a5649b8b1fba057f3fdd5ca15cc3af822b66.zip",
+            "reference": "81b5a5649b8b1fba057f3fdd5ca15cc3af822b66",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "doctrine/common": ">=2.2,<2.4-dev",
+            "symfony/config": "2.2.*",
+            "symfony/yaml": "2.2.*",
+            "symfony/http-kernel": "2.2.*",
+            "psr/log": ">=1.0,<2.0"
+        },
+        "suggest": {
+            "doctrine/common": ">=2.2,<2.4-dev",
+            "symfony/config": "2.2.*",
+            "symfony/yaml": "2.2.*"
+        },
+        "time": "2013-01-15 17:01:40",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.2-dev"
+            }
+        },
+        "installation-source": "source",
+        "autoload": {
+            "psr-0": {
+                "Symfony\\Component\\Routing\\": ""
+            }
+        },
+        "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 Routing Component",
+        "homepage": "http://symfony.com"
+    },
     {
         "name": "silex/silex",
         "version": "dev-master",
@@ -1908,12 +1908,12 @@
         "source": {
             "type": "git",
             "url": "git://github.com/fabpot/Silex.git",
-            "reference": "c3dc8d7e0fba4a2858dc2099066f7e593bee2045"
+            "reference": "3d5d39ea73ef1fa8366957e96fa9204805d7cac6"
         },
         "dist": {
             "type": "zip",
-            "url": "https://github.com/fabpot/Silex/archive/c3dc8d7e0fba4a2858dc2099066f7e593bee2045.zip",
-            "reference": "c3dc8d7e0fba4a2858dc2099066f7e593bee2045",
+            "url": "https://github.com/fabpot/Silex/archive/3d5d39ea73ef1fa8366957e96fa9204805d7cac6.zip",
+            "reference": "3d5d39ea73ef1fa8366957e96fa9204805d7cac6",
             "shasum": ""
         },
         "require": {
@@ -1948,7 +1948,7 @@
             "symfony/css-selector": ">=2.1,<2.3-dev",
             "symfony/dom-crawler": ">=2.1,<2.3-dev"
         },
-        "time": "2013-01-13 19:52:32",
+        "time": "2013-01-15 13:27:32",
         "type": "library",
         "extra": {
             "branch-alias": {