Revert "Update to symfony 2.7"

This reverts commit 2baba4b5e5be7887775aefea3d6c9b91676810a4.

app/AppKernel.php

@@ -14,6 +14,7 @@ class AppKernel extends Kernel
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
             new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
+            new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new FOS\UserBundle\FOSUserBundle(),

app/config/config.yml

@@ -35,6 +35,17 @@ twig:
         google_analytics: %google_analytics%
         packagist_host: %packagist_host%
 
+# Assetic Configuration
+assetic:
+    debug:          %kernel.debug%
+    use_controller: false
+    filters:
+        cssrewrite: ~
+        closure:
+            jar: %kernel.root_dir%/java/compiler.jar
+        yui_css:
+            jar: %kernel.root_dir%/java/yuicompressor-2.4.2.jar
+
 # Doctrine Configuration
 doctrine:
     dbal:

composer.json

@@ -24,31 +24,34 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "symfony/symfony": "^2.6",
-        "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",
-        "jms/security-extra-bundle": "^1.5",
-        "jms/di-extra-bundle": "^1.4",
+        "symfony/symfony": "2.3.*@dev",
+        "doctrine/orm": "~2.3",
+        "doctrine/doctrine-bundle": "1.2.*",
+        "twig/extensions": "~1.0",
+        "symfony/assetic-bundle": "2.3.*",
+        "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.*",
+        "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",
-        "nelmio/solarium-bundle": "^1.0",
-        "nelmio/security-bundle": "^1.0",
+        "composer/composer": "~1.0@dev",
+        "friendsofsymfony/user-bundle": "1.*",
+        "hwi/oauth-bundle": "~0.4@dev",
+        "nelmio/solarium-bundle": "~1.0",
+        "nelmio/security-bundle": "~1.0",
         "predis/predis": "0.8.*",
         "snc/redis-bundle": "~1.1@dev",
         "white-october/pagerfanta-bundle": "~1.0",
-        "zendframework/zend-feed": "^2.0",
-        "zendframework/zend-servicemanager": "^2.0",
-        "zendframework/zend-uri": "^2.0",
-        "zendframework/zend-version": "^2.0",
-        "pagerfanta/pagerfanta": "^1.0",
+        "zendframework/zend-feed": "2.0.*",
+        "zendframework/zend-servicemanager": "2.0.*",
+        "zendframework/zend-uri": "2.0.*",
+        "zendframework/zend-version": "2.0.*",
+
+        "kriswallsmith/assetic": "~1.2",
+        "pagerfanta/pagerfanta": "~1.0",
         "knplabs/knp-menu-bundle": "^2.0"
     },
     "scripts": {

src/Packagist/WebBundle/Controller/ApiController.php

@@ -12,7 +12,6 @@
 
 namespace Packagist\WebBundle\Controller;
 
-use Composer\Console\HtmlOutputFormatter;
 use Composer\Factory;
 use Composer\IO\BufferIO;
 use Composer\Package\Loader\ArrayLoader;
@@ -208,7 +207,7 @@ class ApiController extends Controller
         // put both updating the database and scanning the repository in a transaction
         $em = $this->get('doctrine.orm.entity_manager');
         $updater = $this->get('packagist.package_updater');
-        $io = new BufferIO('', OutputInterface::VERBOSITY_VERBOSE, new HtmlOutputFormatter(Factory::createAdditionalStyles()));
+        $io = new BufferIO('', OutputInterface::VERBOSITY_VERBOSE);
 
         try {
             foreach ($packages as $package) {

src/Packagist/WebBundle/Controller/WebController.php

@@ -714,7 +714,7 @@ class WebController extends Controller
             $this->get('security.context')->isGranted('ROLE_DELETE_PACKAGES')
             || $package->getMaintainers()->contains($this->getUser())
         )) {
-            $data['deleteVersionCsrfToken'] = $this->get('security.csrf.token_manager')->getToken('delete_version');
+            $data['deleteVersionCsrfToken'] = $this->get('form.csrf_provider')->generateCsrfToken('delete_version');
         }
 
         return $data;

src/Packagist/WebBundle/Form/Type/AddMaintainerRequestType.php

@@ -14,7 +14,7 @@ namespace Packagist\WebBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
@@ -26,7 +26,7 @@ class AddMaintainerRequestType extends AbstractType
         $builder->add('user', 'fos_user_username');
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'data_class' => 'Packagist\WebBundle\Form\Model\MaintainerRequest',

src/Packagist/WebBundle/Form/Type/OrderByType.php

@@ -14,7 +14,7 @@ namespace Packagist\WebBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * @author Benjamin Michalski <benjamin.michalski@gmail.com>
@@ -32,7 +32,7 @@ class OrderByType extends AbstractType
         ));
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'data_class' => 'Packagist\WebBundle\Form\Model\OrderBy',

src/Packagist/WebBundle/Form/Type/RemoveMaintainerRequestType.php

@@ -17,7 +17,7 @@ use Packagist\WebBundle\Entity\Package;
 use Packagist\WebBundle\Entity\User;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
@@ -34,7 +34,7 @@ class RemoveMaintainerRequestType extends AbstractType
         ));
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setRequired(array('package'));
         $resolver->setDefaults(array(

src/Packagist/WebBundle/Form/Type/SearchQueryType.php

@@ -14,7 +14,7 @@ namespace Packagist\WebBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * @author Igor Wiedler <igor@wiedler.ch>
@@ -31,7 +31,7 @@ class SearchQueryType extends AbstractType
         ));
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
             'data_class' => 'Packagist\WebBundle\Form\Model\SearchQuery',

src/Packagist/WebBundle/Menu/MenuBuilder.php

@@ -3,7 +3,7 @@
 namespace Packagist\WebBundle\Menu;
 
 use Knp\Menu\FactoryInterface;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\SecurityContextInterface;
 
 class MenuBuilder
 {
@@ -12,14 +12,14 @@ class MenuBuilder
 
     /**
      * @param FactoryInterface $factory
-     * @param TokenStorageInterface $securityContext
+     * @param SecurityContextInterface $securityContext
      */
-    public function __construct(FactoryInterface $factory, TokenStorageInterface $securityContext)
+    public function __construct(FactoryInterface $factory, SecurityContextInterface $securityContext)
     {
         $this->factory = $factory;
 
-        if ($securityContext->getToken() && $securityContext->getToken()->getUser()) {
-            $this->username = $securityContext->getToken()->getUser()->getUsername();
+        if ($securityContext->getToken() && $securityContext->getToken()->getUsername()) {
+            $this->username = $securityContext->getToken()->getUsername();
         }
     }
 

src/Packagist/WebBundle/Resources/config/services.yml

@@ -94,7 +94,7 @@ services:
 
     packagist.menu_builder:
         class: Packagist\WebBundle\Menu\MenuBuilder
-        arguments: [@knp_menu.factory, @security.token_storage]
+        arguments: [@knp_menu.factory, @security.context]
 
     packagist.menu.user:
         class: Knp\Menu\MenuItem

web/css/humane/jackedup.css

@@ -116,9 +116,3 @@ body {
   opacity: 0.7;
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
 }
-
-.humane pre {
-  background: #2d2d32;
-  color: #fff;
-  text-shadow: none;
-}