Преглед изворни кода

Update to sf2.3, fixes #319

Jordi Boggiano пре 11 година
родитељ
комит
27208b6a36
3 измењених фајлова са 389 додато и 168 уклоњено
  1. 2 2
      app/config/config.yml
  2. 12 12
      composer.json
  3. 375 154
      composer.lock

+ 2 - 2
app/config/config.yml

@@ -14,8 +14,8 @@ framework:
     templating:      { engines: ['twig'] } #assets_version: SomeVersionScheme
     default_locale: %locale%
     session:
-        name:           packagist
-        lifetime:       3600
+        name: packagist
+        cookie_lifetime: 3600
     trusted_proxies: %trusted_proxies%
 
 # Twig Configuration

+ 12 - 12
composer.json

@@ -24,20 +24,20 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "symfony/symfony": "2.1.*",
-        "doctrine/orm": ">=2.2.3,<2.4-dev",
-        "doctrine/doctrine-bundle": "1.0.*",
-        "twig/extensions": "1.0.*@alpha",
+        "symfony/symfony": "2.3.*",
+        "doctrine/orm": "~2.3",
+        "doctrine/doctrine-bundle": "1.2.*",
+        "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "2.1.*",
-        "symfony/swiftmailer-bundle": "2.1.*",
-        "symfony/monolog-bundle": "2.1.*",
-        "sensio/distribution-bundle": "2.1.*",
-        "sensio/framework-extra-bundle": "2.1.*",
-        "sensio/generator-bundle": "2.1.*",
-        "jms/security-extra-bundle": "1.2.*",
-        "jms/di-extra-bundle": "1.1.*",
+        "symfony/swiftmailer-bundle": "2.3.*",
+        "symfony/monolog-bundle": "2.3.*",
+        "sensio/distribution-bundle": "2.3.*",
+        "sensio/framework-extra-bundle": "2.3.*",
+        "sensio/generator-bundle": "2.3.*",
+        "jms/security-extra-bundle": "1.5.*",
+        "jms/di-extra-bundle": "1.4.*",
 
-        "composer/composer": "dev-master",
+        "composer/composer": "1.0.x-dev",
         "friendsofsymfony/user-bundle": "1.*",
         "hwi/oauth-bundle": "dev-master",
         "nelmio/solarium-bundle": "1.*",

Разлика између датотеке није приказан због своје велике величине
+ 375 - 154
composer.lock


Неке датотеке нису приказане због велике количине промена