Update to symfony 2.7

app/AppKernel.php

@@ -14,7 +14,6 @@ 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,17 +35,6 @@ 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,34 +24,31 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "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.*",
+        "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",
 
-        "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",
+        "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",
         "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.*",
-
-        "kriswallsmith/assetic": "~1.2",
-        "pagerfanta/pagerfanta": "~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",
         "knplabs/knp-menu-bundle": "^2.0"
     },
     "scripts": {

src/Packagist/WebBundle/Controller/ApiController.php

@@ -12,6 +12,7 @@
 
 namespace Packagist\WebBundle\Controller;
 
+use Composer\Console\HtmlOutputFormatter;
 use Composer\Factory;
 use Composer\IO\BufferIO;
 use Composer\Package\Loader\ArrayLoader;
@@ -207,7 +208,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);
+        $io = new BufferIO('', OutputInterface::VERBOSITY_VERBOSE, new HtmlOutputFormatter(Factory::createAdditionalStyles()));
 
         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('form.csrf_provider')->generateCsrfToken('delete_version');
+            $data['deleteVersionCsrfToken'] = $this->get('security.csrf.token_manager')->getToken('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\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
@@ -26,7 +26,7 @@ class AddMaintainerRequestType extends AbstractType
         $builder->add('user', 'fos_user_username');
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $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\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @author Benjamin Michalski <benjamin.michalski@gmail.com>
@@ -32,7 +32,7 @@ class OrderByType extends AbstractType
         ));
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $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\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
@@ -34,7 +34,7 @@ class RemoveMaintainerRequestType extends AbstractType
         ));
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $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\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @author Igor Wiedler <igor@wiedler.ch>
@@ -31,7 +31,7 @@ class SearchQueryType extends AbstractType
         ));
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $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\SecurityContextInterface;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
 class MenuBuilder
 {
@@ -12,14 +12,14 @@ class MenuBuilder
 
     /**
      * @param FactoryInterface $factory
-     * @param SecurityContextInterface $securityContext
+     * @param TokenStorageInterface $securityContext
      */
-    public function __construct(FactoryInterface $factory, SecurityContextInterface $securityContext)
+    public function __construct(FactoryInterface $factory, TokenStorageInterface $securityContext)
     {
         $this->factory = $factory;
 
-        if ($securityContext->getToken() && $securityContext->getToken()->getUsername()) {
-            $this->username = $securityContext->getToken()->getUsername();
+        if ($securityContext->getToken() && $securityContext->getToken()->getUser()) {
+            $this->username = $securityContext->getToken()->getUser()->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.context]
+        arguments: [@knp_menu.factory, @security.token_storage]
 
     packagist.menu.user:
         class: Knp\Menu\MenuItem

src/Packagist/WebBundle/Resources/public/js/view.js

@@ -110,9 +110,7 @@
     $('.package .delete-version .submit').click(function (e) {
         e.preventDefault();
         e.stopImmediatePropagation();
-        if (window.confirm('Are you sure?')) {
-            $(e.target).closest('.delete-version').submit();
-        }
+        $(e.target).closest('.delete-version').submit();
     });
     $('.package .delete-version').submit(function (e) {
         e.preventDefault();

src/Packagist/WebBundle/Resources/translations/messages.en.yml

@@ -9,6 +9,7 @@ menu:
     register: Register
     browse_packages: Browse Packages
     twitter: Follow @packagist
+    github: GitHub
     contact: Contact
     stats: Statistics
 
@@ -18,4 +19,4 @@ link_type:
     suggest: Suggests
     conflict: Conflicts
     replace: Replaces
-    provide: Provides
+    provide: Provides

web/css/humane/jackedup.css

@@ -25,17 +25,10 @@ body {
   color: #333;
   padding: 10px;
   text-align: center;
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAACWCAYAAAAfduJyAAAABmJLR0QA/wD/AP+gvaeTAAAAIklEQVQokWNgYGCQZGJgYGDARTDSQnboGDqsnDt0DKWNLAAkiQFdC+vZNQAAAABJRU5ErkJggg==');
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(0,0,0,0.1)), color-stop(1, rgba(0,0,0,0.2))) no-repeat;
-  background: -moz-linear-gradient(top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0.2) 100%) no-repeat;
-  background: -webkit-linear-gradient(top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0.2) 100%) no-repeat;
-  background: -ms-linear-gradient(top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0.2) 100%) no-repeat;
-  background: -o-linear-gradient(top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0.2) 100%) no-repeat;
-  background: linear-gradient(top, rgba(0,0,0,0.1) 0%, rgba(0,0,0,0.2) 100%) no-repeat;
-  background-color: #fff;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
+  background-color: #fafafa;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
   text-shadow: 0 1px 1px rgba(255,255,255,0.8);
   -moz-box-shadow: 0 1px 2px rgba(0,0,0,0.5);
   -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.5);
@@ -123,3 +116,9 @@ body {
   opacity: 0.7;
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
 }
+
+.humane pre {
+  background: #2d2d32;
+  color: #fff;
+  text-shadow: none;
+}