Explorar el Código

More migration fixes

Jordi Boggiano hace 6 años
padre
commit
b8fd56a41b

+ 1 - 1
src/Packagist/WebBundle/Command/RunWorkersCommand.php

@@ -39,7 +39,7 @@ class RunWorkersCommand extends ContainerAwareCommand
             $worker = $this->getContainer()->get('packagist.queue_worker');
 
             $logger->notice('Worker started successfully');
-            $this->getContainer()->get('packagist.log_resetter')->reset();
+            $logger->reset();
 
             $worker->processMessages((int) $input->getOption('messages'));
 

+ 3 - 3
src/Packagist/WebBundle/Controller/PackageController.php

@@ -149,7 +149,7 @@ class PackageController extends Controller
         $package = new Package;
         $package->setEntityRepository($this->getDoctrine()->getRepository('PackagistWebBundle:Package'));
         $package->setRouter($this->get('router'));
-        $form = $this->createForm(new PackageType, $package);
+        $form = $this->createForm(PackageType::class, $package);
         $user = $this->getUser();
         $package->addMaintainer($user);
 
@@ -277,7 +277,7 @@ class PackageController extends Controller
         }
 
         try {
-            $redis = $this->get('snc_redis.default');
+            $redis = $this->get('snc_redis.default_client');
             $trendiness = array();
             foreach ($providers as $package) {
                 /** @var Package $package */
@@ -498,7 +498,7 @@ class PackageController extends Controller
         $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
 
         $html = $this->renderView(
-            'PackagistWebBundle:Package:version_details.html.twig',
+            'PackagistWebBundle:package:version_details.html.twig',
             array('version' => $repo->getFullVersion($versionId))
         );
 

+ 4 - 4
src/Packagist/WebBundle/Model/PackageManager.php

@@ -15,7 +15,7 @@ namespace Packagist\WebBundle\Model;
 use Symfony\Bridge\Doctrine\RegistryInterface;
 use Packagist\WebBundle\Entity\Package;
 use Psr\Log\LoggerInterface;
-use AlgoliaSearch\Client as AlgoliaClient;
+use Algolia\AlgoliaSearch\SearchClient;
 use Packagist\WebBundle\Service\GitHubUserMigrationWorker;
 
 /**
@@ -34,7 +34,7 @@ class PackageManager
     protected $githubWorker;
     protected $metadataDir;
 
-    public function __construct(RegistryInterface $doctrine, \Swift_Mailer $mailer, \Twig_Environment $twig, LoggerInterface $logger, array $options, ProviderManager $providerManager, AlgoliaClient $algoliaClient, string $algoliaIndexName, GitHubUserMigrationWorker $githubWorker, string $metadataDir)
+    public function __construct(RegistryInterface $doctrine, \Swift_Mailer $mailer, \Twig_Environment $twig, LoggerInterface $logger, array $options, ProviderManager $providerManager, SearchClient $algoliaClient, string $algoliaIndexName, GitHubUserMigrationWorker $githubWorker, string $metadataDir)
     {
         $this->doctrine = $doctrine;
         $this->mailer = $mailer;
@@ -111,7 +111,7 @@ class PackageManager
                     'details' => strip_tags($details),
                 ));
 
-                $message = \Swift_Message::newInstance()
+                $message = (new \Swift_Message)
                     ->setSubject($package->getName().' failed to update, invalid composer.json data')
                     ->setFrom($this->options['from'], $this->options['fromName'])
                     ->setTo($recipients)
@@ -140,7 +140,7 @@ class PackageManager
             'package_name' => $package->getName()
         ));
 
-        $message = \Swift_Message::newInstance()
+        $message = (new \Swift_Message)
             ->setSubject('You have been added to ' . $package->getName() . ' as a maintainer')
             ->setFrom($this->options['from'], $this->options['fromName'])
             ->setTo($user->getEmail())

+ 2 - 1
src/Packagist/WebBundle/Resources/config/services.yml

@@ -172,8 +172,9 @@ services:
 
     packagist.algolia.client:
         public: true
-        class: AlgoliaSearch\Client
+        class: Algolia\AlgoliaSearch\SearchClient
         arguments: ['%algolia.app_id%', '%algolia.admin_key%']
+        factory: ['Algolia\AlgoliaSearch\SearchClient', create]
 
     packagist.queue_worker:
         public: true

+ 2 - 2
src/Packagist/WebBundle/Resources/views/layout.html.twig

@@ -113,10 +113,10 @@
         {{ include("PackagistWebBundle:web:search_section.html.twig", {showSearchDesc: showSearchDesc|default('show')}) }}
 
         {% block flashMessages %}
-            {%- if app.session.flashbag.peekAll()|length > 0 %}
+            {%- if app.request.hasPreviousSession and app.session.flashbag.peekAll()|length > 0 %}
             <section class="wrapper wrapper-white">
                 <div class="container flash-container">
-                {%- for type, flashMessages in app.session.flashbag.all() %}
+                {%- for type, flashMessages in app.flashes() %}
                     {%- for flashMessage in flashMessages %}
                         {%- if 'fos_user_' in type %}
                             <div class="alert alert-{{ type|replace({'fos_user_': ''}) }}">