Update deps to latest

composer.json

@@ -24,32 +24,31 @@
     },
     "require": {
         "php": ">=5.5",
-        "symfony/symfony": "2.5.0",
-        "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.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.*",
-
-        "pagerfanta/pagerfanta": "~1.0",
+        "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",
         "knplabs/knp-menu-bundle": "^2.0",
         "ezyang/htmlpurifier": "^4.6"
     },

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;
@@ -208,7 +209,7 @@ class ApiController extends Controller
         $em = $this->get('doctrine.orm.entity_manager');
         $updater = $this->get('packagist.package_updater');
         $config = Factory::createConfig();
-        $io = new BufferIO('', OutputInterface::VERBOSITY_VERBOSE);
+        $io = new BufferIO('', OutputInterface::VERBOSITY_VERBOSE, new HtmlOutputFormatter(Factory::createAdditionalStyles()));
         $io->loadConfiguration($config);
 
         try {

src/Packagist/WebBundle/Controller/PackageController.php

@@ -31,7 +31,7 @@ class PackageController extends Controller
             throw $this->createNotFoundException("The requested package, $name, could not be found.");
         }
 
-        if (!$package->getMaintainers()->contains($this->getUser()) && !$this->get('security.context')->isGranted('ROLE_EDIT_PACKAGES')) {
+        if (!$package->getMaintainers()->contains($this->getUser()) && !$this->get('security.authorization_checker')->isGranted('ROLE_EDIT_PACKAGES')) {
             throw new AccessDeniedException;
         }
 
@@ -83,7 +83,7 @@ class PackageController extends Controller
             throw $this->createNotFoundException("The requested package, $name, could not be found.");
         }
 
-        if (!$package->getMaintainers()->contains($this->getUser()) && !$this->get('security.context')->isGranted('ROLE_EDIT_PACKAGES')) {
+        if (!$package->getMaintainers()->contains($this->getUser()) && !$this->get('security.authorization_checker')->isGranted('ROLE_EDIT_PACKAGES')) {
             throw new AccessDeniedException;
         }
 
@@ -127,7 +127,7 @@ class PackageController extends Controller
             throw $this->createNotFoundException("The requested package, $name, could not be found.");
         }
 
-        if (!$package->getMaintainers()->contains($this->getUser()) && !$this->get('security.context')->isGranted('ROLE_EDIT_PACKAGES')) {
+        if (!$package->getMaintainers()->contains($this->getUser()) && !$this->get('security.authorization_checker')->isGranted('ROLE_EDIT_PACKAGES')) {
             throw new AccessDeniedException;
         }
 

src/Packagist/WebBundle/Controller/UserController.php

@@ -51,7 +51,7 @@ class UserController extends Controller
 
     public function myProfileAction(Request $req)
     {
-        $user = $this->container->get('security.context')->getToken()->getUser();
+        $user = $this->container->get('security.token_storage')->getToken()->getUser();
         if (!is_object($user) || !$user instanceof UserInterface) {
             throw new AccessDeniedException('This user does not have access to this section.');
         }

src/Packagist/WebBundle/Controller/WebController.php

@@ -712,10 +712,10 @@ class WebController extends Controller
             $data['deleteForm'] = $deleteForm->createView();
         }
         if ($this->getUser() && (
-            $this->get('security.context')->isGranted('ROLE_DELETE_PACKAGES')
+            $this->get('security.authorization_checker')->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;
@@ -816,7 +816,7 @@ class WebController extends Controller
         $version = $repo->getFullVersion($versionId);
         $package = $version->getPackage();
 
-        if (!$package->getMaintainers()->contains($this->getUser()) && !$this->get('security.context')->isGranted('ROLE_DELETE_PACKAGES')) {
+        if (!$package->getMaintainers()->contains($this->getUser()) && !$this->get('security.authorization_checker')->isGranted('ROLE_DELETE_PACKAGES')) {
             throw new AccessDeniedException;
         }
 
@@ -870,7 +870,7 @@ class WebController extends Controller
             return new Response(json_encode(array('status' => 'error', 'message' => 'Invalid credentials',)), 403);
         }
 
-        if ($package->getMaintainers()->contains($user) || $this->get('security.context')->isGranted('ROLE_UPDATE_PACKAGES')) {
+        if ($package->getMaintainers()->contains($user) || $this->get('security.authorization_checker')->isGranted('ROLE_UPDATE_PACKAGES')) {
             $req->getSession()->save();
 
             if (null !== $autoUpdated) {
@@ -1182,7 +1182,7 @@ class WebController extends Controller
             return;
         }
 
-        if ($this->get('security.context')->isGranted('ROLE_EDIT_PACKAGES') || $package->getMaintainers()->contains($user)) {
+        if ($this->get('security.authorization_checker')->isGranted('ROLE_EDIT_PACKAGES') || $package->getMaintainers()->contains($user)) {
             $maintainerRequest = new MaintainerRequest;
             return $this->createForm(new AddMaintainerRequestType, $maintainerRequest);
         }
@@ -1194,7 +1194,7 @@ class WebController extends Controller
             return;
         }
 
-        if ($this->get('security.context')->isGranted('ROLE_EDIT_PACKAGES') || $package->getMaintainers()->contains($user)) {
+        if ($this->get('security.authorization_checker')->isGranted('ROLE_EDIT_PACKAGES') || $package->getMaintainers()->contains($user)) {
             $maintainerRequest = new MaintainerRequest;
             return $this->createForm(new RemoveMaintainerRequestType(), $maintainerRequest, array('package'=>$package, 'excludeUser'=>$user));
         }
@@ -1207,7 +1207,7 @@ class WebController extends Controller
         }
 
         // super admins bypass additional checks
-        if (!$this->get('security.context')->isGranted('ROLE_DELETE_PACKAGES')) {
+        if (!$this->get('security.authorization_checker')->isGranted('ROLE_DELETE_PACKAGES')) {
             // non maintainers can not delete
             if (!$package->getMaintainers()->contains($user)) {
                 return;

src/Packagist/WebBundle/Entity/Package.php

@@ -31,9 +31,9 @@ use Symfony\Component\Validator\ExecutionContextInterface;
  *         @ORM\Index(name="dumped_idx",columns={"dumpedAt"})
  *     }
  * )
- * @Assert\Callback(methods={"isPackageUnique"})
- * @Assert\Callback(methods={"isVendorWritable"})
- * @Assert\Callback(methods={"isRepositoryValid"}, groups={"Update", "Default"})
+ * @Assert\Callback(callback="isPackageUnique")
+ * @Assert\Callback(callback="isVendorWritable")
+ * @Assert\Callback(callback="isRepositoryValid", groups={"Update", "Default"})
  * @author Jordi Boggiano <j.boggiano@seld.be>
  */
 class Package

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/translations/messages.en.yml

@@ -20,3 +20,10 @@ link_type:
     conflict: Conflicts
     replace: Replaces
     provide: Provides
+
+'Search packages...': 'Search packages...'
+Sort: 'Sort'
+Order: 'Order'
+Username: 'Username'
+asc: 'asc'
+desc: 'desc'

web/css/humane/jackedup.css

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