瀏覽代碼

Update vendors

Jordi Boggiano 12 年之前
父節點
當前提交
cdc6030009
共有 4 個文件被更改,包括 199 次插入163 次删除
  1. 2 4
      composer.json
  2. 195 157
      composer.lock
  3. 1 1
      src/Packagist/WebBundle/Controller/Controller.php
  4. 1 1
      src/Packagist/WebBundle/Controller/WebController.php

+ 2 - 4
composer.json

@@ -1,5 +1,4 @@
 {
-    "minimum-stability": "dev",
     "description": "Package Repository Website",
     "keywords": ["package", "composer"],
     "homepage": "http://packagist.org/",
@@ -39,15 +38,14 @@
         "jms/di-extra-bundle": "1.1.*",
 
         "composer/composer": "dev-master",
-        "friendsofsymfony/user-bundle": "2.0.*",
+        "friendsofsymfony/user-bundle": "1.*",
         "hwi/oauth-bundle": "dev-master",
         "nelmio/solarium-bundle": "dev-master",
         "nelmio/security-bundle": "dev-master",
-        "predis/predis": "0.7.*",
+        "predis/predis": "0.8.*",
         "snc/redis-bundle": "dev-master",
         "white-october/pagerfanta-bundle": "dev-master",
         "zendframework/zend-feed": "2.0.*",
-
         "zendframework/zend-servicemanager": "2.0.*",
         "zendframework/zend-uri": "2.0.*",
         "zendframework/zend-version": "2.0.*"

File diff suppressed because it is too large
+ 195 - 157
composer.lock


+ 1 - 1
src/Packagist/WebBundle/Controller/Controller.php

@@ -37,7 +37,7 @@ class Controller extends BaseController
                 'downloads' => array_combine(array_keys($dlKeys), $res),
                 'favers' => $this->get('packagist.favorite_manager')->getFaverCounts(array_keys($dlKeys)),
             );
-        } catch (\Predis\Network\ConnectionException $e) {}
+        } catch (\Predis\Connection\ConnectionException $e) {}
 
         return $metadata;
     }

+ 1 - 1
src/Packagist/WebBundle/Controller/WebController.php

@@ -41,7 +41,7 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Pagerfanta\Pagerfanta;
 use Pagerfanta\Adapter\DoctrineORMAdapter;
 use Pagerfanta\Adapter\SolariumAdapter;
-use Predis\Network\ConnectionException;
+use Predis\Connection\ConnectionException;
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>

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