Deps update and fix deprecated stuff

vtsykun · Dec 13, 2015 · b6588d1 · b6588d1
1 parent 15db149
commit b6588d1
Show file tree

Hide file tree

Showing 34 changed files with 1,251 additions and 467 deletions.
diff --git a/app/autoload.php b/app/autoload.php
@@ -2,6 +2,8 @@
 
 use Doctrine\Common\Annotations\AnnotationRegistry;
 
+error_reporting(error_reporting() & ~E_USER_DEPRECATED);
+
 if (!$loader = @include __DIR__.'/../vendor/autoload.php') {
 
     $message = <<< EOF

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -12,7 +12,9 @@ framework:
     csrf_protection: true
     validation:      { enable_annotations: true }
     translator:      { fallback: en }
-    templating:      { engines: ['twig'], assets_version: v=%assets_version% }
+    templating:      { engines: ['twig'] }
+    assets:
+        version: v=%assets_version%
     default_locale: %locale%
     session:
         name:            packagist
@@ -26,9 +28,8 @@ framework:
 
 # Twig Configuration
 twig:
-    form:
-        resources:
-           - 'PackagistWebBundle::forms.html.twig'
+    form_themes:
+        - 'PackagistWebBundle::forms.html.twig'
     debug:            %kernel.debug%
     strict_variables: %kernel.debug%
     globals:
@@ -44,6 +45,8 @@ doctrine:
         user:     %database_user%
         password: %database_password%
         charset:  UTF8
+        # See https://github.com/sonata-project/SonataAdminBundle/issues/3342
+        server_version: 5.6
     orm:
         auto_generate_proxy_classes: %kernel.debug%
         auto_mapping: true
@@ -73,15 +76,12 @@ fos_user:
     from_email:
         address:        %mailer_from_email%
         sender_name:    %mailer_from_name%
-    registration:
-        form:
-            handler: packagist.form.handler.registration
     profile:
         form:
             type:       packagist_user_profile
 
 hwi_oauth:
-    firewall_name: main
+    firewall_names: [main]
     connect:
         account_connector: packagist.user_provider
         registration_form_handler: packagist.oauth.registration_form_handler

diff --git a/app/config/security.yml b/app/config/security.yml
@@ -19,7 +19,7 @@ security:
                 check_path:     /login_check
                 failure_path:   null
             remember_me:
-                key: %remember_me.secret%
+                secret: %remember_me.secret%
                 user_providers: packagist
                 name: pauth
                 always_remember_me: true

diff --git a/app/console b/app/console
@@ -1,6 +1,11 @@
 #!/usr/bin/env php
 <?php
 
+use Composer\Autoload\ClassLoader;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
 // if you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
 //umask(0000);
@@ -9,12 +14,10 @@ ini_set('date.timezone', 'UTC');
 
 set_time_limit(0);
 
-require_once __DIR__.'/bootstrap.php.cache';
-require_once __DIR__.'/AppKernel.php';
-
-use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
+/**
+ * @var ClassLoader
+ */
+$loader = require __DIR__.'/autoload.php';
 
 $input = new ArgvInput();
 $env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');

diff --git a/composer.json b/composer.json
@@ -20,29 +20,30 @@
           "email": "[email protected]"
     },
     "autoload": {
-        "psr-4": { "Packagist\\": "src/Packagist/" }
+        "psr-4": { "Packagist\\": "src/Packagist/" },
+        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
     },
     "require": {
         "php": ">=5.5",
-        "symfony/symfony": "^2.7",
+        "symfony/symfony": "^2.8",
         "doctrine/orm": "^2.3",
         "doctrine/doctrine-bundle": "^1.2",
         "twig/extensions": "^1.0",
         "symfony/swiftmailer-bundle": "^2.3",
         "symfony/monolog-bundle": "^2.4",
-        "sensio/distribution-bundle": "^2.3",
-        "sensio/framework-extra-bundle": "^2.3",
-        "sensio/generator-bundle": "^2.3",
+        "sensio/distribution-bundle": "^5.0",
+        "sensio/framework-extra-bundle": "^3.0",
+        "sensio/generator-bundle": "^3.0",
         "jms/security-extra-bundle": "^1.5",
         "jms/di-extra-bundle": "^1.4",
 
         "composer/composer": "^1.0@dev",
-        "friendsofsymfony/user-bundle": "^1.0",
-        "hwi/oauth-bundle": "^0.4@dev",
+        "friendsofsymfony/user-bundle": "^2.0@dev",
+        "hwi/oauth-bundle": "^0.4",
         "nelmio/solarium-bundle": "^1.0",
         "nelmio/security-bundle": "^1.0",
         "predis/predis": "^1.0",
-        "snc/redis-bundle": "^1.1.9",
+        "snc/redis-bundle": "dev-master",
         "white-october/pagerfanta-bundle": "^1.0",
         "zendframework/zend-feed": "^2.0",
         "zendframework/zend-servicemanager": "^2.0",
@@ -52,6 +53,14 @@
         "knplabs/knp-menu-bundle": "^2.0",
         "ezyang/htmlpurifier": "^4.6"
     },
+    "require-dev": {
+        "symfony/phpunit-bridge": "^2.7 || ^3.0"
+    },
+    "conflict": {
+        "knplabs/knp-menu": "<=2.1.0"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "scripts": {
         "post-install-cmd": [
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",