Update all deps, fix some deprecation warnings

composer.json

@@ -60,7 +60,7 @@
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^4.2",
-        "phpunit/phpunit": "^6.5"
+        "phpunit/phpunit": "^8.0"
     },
     "scripts": {
         "post-install-cmd": [

src/Packagist/WebBundle/Controller/ApiController.php

@@ -57,7 +57,7 @@ class ApiController extends Controller
         }
         $url = $payload['repository']['url'];
         $package = new Package;
-        $package->setEntityRepository($this->getDoctrine()->getRepository('PackagistWebBundle:Package'));
+        $package->setEntityRepository($this->getDoctrine()->getRepository(Package::class));
         $package->setRouter($this->get('router'));
         $user = $this->findUser($request);
         $package->addMaintainer($user);
@@ -406,6 +406,6 @@ class ApiController extends Controller
      */
     protected function findPackagesByRepository(string $url): array
     {
-        return $this->getDoctrine()->getRepository('PackagistWebBundle:Package')->findBy(['repository' => $url]);
+        return $this->getDoctrine()->getRepository(Package::class)->findBy(['repository' => $url]);
     }
 }

src/Packagist/WebBundle/Controller/ExploreController.php

@@ -37,7 +37,7 @@ class ExploreController extends Controller
     public function exploreAction()
     {
         /** @var PackageRepository $pkgRepo */
-        $pkgRepo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        $pkgRepo = $this->getDoctrine()->getRepository(Package::class);
         /** @var VersionRepository $verRepo */
         $verRepo = $this->get('packagist.version_repository');
         $newSubmitted = $pkgRepo->getQueryBuilderForNewestPackages()->setMaxResults(10)
@@ -96,7 +96,7 @@ class ExploreController extends Controller
                 (min(1, (int) $req->get('page', 1)) - 1) * $perPage,
                 min(1, (int) $req->get('page', 1)) * $perPage - 1
             );
-            $popular = $this->getDoctrine()->getRepository('PackagistWebBundle:Package')
+            $popular = $this->getDoctrine()->getRepository(Package::class)
                 ->createQueryBuilder('p')->where('p.id IN (:ids)')->setParameter('ids', $popularIds)
                 ->getQuery()->useResultCache(true, 900)->getResult();
             usort($popular, function ($a, $b) use ($popularIds) {

src/Packagist/WebBundle/Controller/FeedController.php

@@ -50,7 +50,7 @@ class FeedController extends Controller
     public function packagesAction(Request $req)
     {
         /** @var $repo \Packagist\WebBundle\Entity\PackageRepository */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        $repo = $this->getDoctrine()->getRepository(Package::class);
         $packages = $this->getLimitedResults(
             $repo->getQueryBuilderForNewestPackages()
         );
@@ -77,7 +77,7 @@ class FeedController extends Controller
     public function releasesAction(Request $req)
     {
         /** @var $repo \Packagist\WebBundle\Entity\VersionRepository */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
+        $repo = $this->getDoctrine()->getRepository(Version::class);
         $packages = $this->getLimitedResults(
             $repo->getQueryBuilderForLatestVersionWithPackage()
         );
@@ -104,7 +104,7 @@ class FeedController extends Controller
     public function vendorAction(Request $req, $vendor)
     {
         /** @var $repo \Packagist\WebBundle\Entity\VersionRepository */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
+        $repo = $this->getDoctrine()->getRepository(Version::class);
         $packages = $this->getLimitedResults(
             $repo->getQueryBuilderForLatestVersionWithPackage($vendor)
         );
@@ -131,7 +131,7 @@ class FeedController extends Controller
     public function packageAction(Request $req, $package)
     {
         /** @var $repo \Packagist\WebBundle\Entity\VersionRepository */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
+        $repo = $this->getDoctrine()->getRepository(Version::class);
         $packages = $this->getLimitedResults(
             $repo->getQueryBuilderForLatestVersionWithPackage(null, $package)
         );

src/Packagist/WebBundle/Controller/PackageController.php

@@ -49,7 +49,7 @@ class PackageController extends Controller
     public function listAction(Request $req)
     {
         /** @var PackageRepository $repo */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        $repo = $this->getDoctrine()->getRepository(Package::class);
         $fields = (array) $req->query->get('fields', array());
         $fields = array_intersect($fields, array('repository', 'type'));
 
@@ -89,7 +89,7 @@ class PackageController extends Controller
         }
 
         /** @var PackageRepository $repo */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        $repo = $this->getDoctrine()->getRepository(Package::class);
 
         $names = $repo->getPackageNamesUpdatedSince($since);
 
@@ -110,7 +110,7 @@ class PackageController extends Controller
         }
 
         $package = new Package;
-        $package->setEntityRepository($this->getDoctrine()->getRepository('PackagistWebBundle:Package'));
+        $package->setEntityRepository($this->getDoctrine()->getRepository(Package::class));
         $package->setRouter($this->get('router'));
         $form = $this->createForm(PackageType::class, $package, [
             'action' => $this->generateUrl('submit'),
@@ -147,7 +147,7 @@ class PackageController extends Controller
     public function fetchInfoAction(Request $req)
     {
         $package = new Package;
-        $package->setEntityRepository($this->getDoctrine()->getRepository('PackagistWebBundle:Package'));
+        $package->setEntityRepository($this->getDoctrine()->getRepository(Package::class));
         $package->setRouter($this->get('router'));
         $form = $this->createForm(PackageType::class, $package);
         $user = $this->getUser();
@@ -204,7 +204,7 @@ class PackageController extends Controller
     public function viewVendorAction($vendor)
     {
         $packages = $this->getDoctrine()
-            ->getRepository('PackagistWebBundle:Package')
+            ->getRepository(Package::class)
             ->getFilteredQueryBuilder(['vendor' => $vendor.'/%'], true)
             ->getQuery()
             ->getResult();
@@ -265,7 +265,7 @@ class PackageController extends Controller
     public function viewProvidersAction($name)
     {
         /** @var PackageRepository $repo */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        $repo = $this->getDoctrine()->getRepository(Package::class);
         $providers = $repo->findProviders($name);
         if (!$providers) {
             return $this->redirect($this->generateUrl('search', array('q' => $name, 'reason' => 'package_not_found')));
@@ -320,7 +320,7 @@ class PackageController extends Controller
         }
 
         /** @var PackageRepository $repo */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        $repo = $this->getDoctrine()->getRepository(Package::class);
 
         try {
             /** @var Package $package */
@@ -342,7 +342,7 @@ class PackageController extends Controller
         }
 
         if ('json' === $req->getRequestFormat()) {
-            $data = $package->toArray($this->getDoctrine()->getRepository('PackagistWebBundle:Version'));
+            $data = $package->toArray($this->getDoctrine()->getRepository(Version::class));
             $data['dependents'] = $repo->getDependentCount($package->getName());
             $data['suggesters'] = $repo->getSuggestCount($package->getName());
 
@@ -375,7 +375,7 @@ class PackageController extends Controller
 
         if (count($versions)) {
             /** @var VersionRepository $versionRepo */
-            $versionRepo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
+            $versionRepo = $this->getDoctrine()->getRepository(Version::class);
             $this->getDoctrine()->getManager()->refresh(reset($versions));
             $version = $versionRepo->getFullVersion(reset($versions)->getId());
 
@@ -440,7 +440,7 @@ class PackageController extends Controller
     public function viewPackageDownloadsAction(Request $req, $name)
     {
         /** @var PackageRepository $repo */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        $repo = $this->getDoctrine()->getRepository(Package::class);
 
         try {
             /** @var $package Package */
@@ -499,7 +499,7 @@ class PackageController extends Controller
         }
 
         /** @var VersionRepository $repo  */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
+        $repo = $this->getDoctrine()->getRepository(Version::class);
 
         $html = $this->renderView(
             'PackagistWebBundle:package:version_details.html.twig',
@@ -520,7 +520,7 @@ class PackageController extends Controller
     public function deletePackageVersionAction(Request $req, $versionId)
     {
         /** @var VersionRepository $repo  */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Version');
+        $repo = $this->getDoctrine()->getRepository(Version::class);
 
         /** @var Version $version  */
         $version = $repo->getFullVersion($versionId);
@@ -551,7 +551,7 @@ class PackageController extends Controller
         try {
             /** @var Package $package */
             $package = $doctrine
-                ->getRepository('PackagistWebBundle:Package')
+                ->getRepository(Package::class)
                 ->getPackageByName($name);
         } catch (NoResultException $e) {
             return new Response(json_encode(array('status' => 'error', 'message' => 'Package not found',)), 404);
@@ -609,7 +609,7 @@ class PackageController extends Controller
         try {
             /** @var Package $package */
             $package = $doctrine
-                ->getRepository('PackagistWebBundle:Package')
+                ->getRepository(Package::class)
                 ->getPartialPackageByNameWithVersions($name);
         } catch (NoResultException $e) {
             throw new NotFoundHttpException('The requested package, '.$name.', was not found.');
@@ -640,7 +640,7 @@ class PackageController extends Controller
     {
         /** @var $package Package */
         $package = $this->getDoctrine()
-            ->getRepository('PackagistWebBundle:Package')
+            ->getRepository(Package::class)
             ->findOneByName($name);
 
         if (!$package) {
@@ -697,7 +697,7 @@ class PackageController extends Controller
     {
         /** @var $package Package */
         $package = $this->getDoctrine()
-            ->getRepository('PackagistWebBundle:Package')
+            ->getRepository(Package::class)
             ->findOneByName($name);
 
         if (!$package) {
@@ -902,7 +902,7 @@ class PackageController extends Controller
         $page = $req->query->get('page', 1);
 
         /** @var PackageRepository $repo */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        $repo = $this->getDoctrine()->getRepository(Package::class);
         $depCount = $repo->getDependentCount($name);
         $packages = $repo->getDependents($name, ($page - 1) * 15, 15);
 
@@ -931,7 +931,7 @@ class PackageController extends Controller
         $page = $req->query->get('page', 1);
 
         /** @var PackageRepository $repo */
-        $repo = $this->getDoctrine()->getRepository('PackagistWebBundle:Package');
+        $repo = $this->getDoctrine()->getRepository(Package::class);
         $suggestCount = $repo->getSuggestCount($name);
         $packages = $repo->getSuggests($name, ($page - 1) * 15, 15);
 
@@ -1028,7 +1028,7 @@ class PackageController extends Controller
         $normalizer = new VersionParser;
         $normVersion = $normalizer->normalize($version);
 
-        $version = $this->getDoctrine()->getRepository('PackagistWebBundle:Version')->findOneBy([
+        $version = $this->getDoctrine()->getRepository(Version::class)->findOneBy([
             'package' => $package,
             'normalizedVersion' => $normVersion
         ]);

src/Packagist/WebBundle/Controller/UserController.php

@@ -16,6 +16,7 @@ use Doctrine\ORM\NoResultException;
 use FOS\UserBundle\Model\UserInterface;
 use Packagist\WebBundle\Entity\Job;
 use Packagist\WebBundle\Entity\Package;
+use Packagist\WebBundle\Entity\Version;
 use Packagist\WebBundle\Entity\User;
 use Packagist\WebBundle\Entity\VersionRepository;
 use Packagist\WebBundle\Model\RedisAdapter;
@@ -108,9 +109,9 @@ class UserController extends Controller
             );
 
             /** @var VersionRepository $versionRepo */
-            $versionRepo = $doctrine->getRepository('PackagistWebBundle:Version');
+            $versionRepo = $doctrine->getRepository(Version::class);
             $packages = $doctrine
-                ->getRepository('PackagistWebBundle:Package')
+                ->getRepository(Package::class)
                 ->getFilteredQueryBuilder(array('maintainer' => $user->getId()), true)
                 ->getQuery()->getResult();
 
@@ -242,7 +243,7 @@ class UserController extends Controller
         $package = $req->request->get('package');
         try {
             $package = $this->getDoctrine()
-                ->getRepository('PackagistWebBundle:Package')
+                ->getRepository(Package::class)
                 ->findOneByName($package);
         } catch (NoResultException $e) {
             throw new NotFoundHttpException('The given package "'.$package.'" was not found.');
@@ -277,7 +278,7 @@ class UserController extends Controller
     protected function getUserPackages($req, $user)
     {
         $packages = $this->getDoctrine()
-            ->getRepository('PackagistWebBundle:Package')
+            ->getRepository(Package::class)
             ->getFilteredQueryBuilder(array('maintainer' => $user->getId()), true);
 
         $paginator = new Pagerfanta(new DoctrineORMAdapter($packages, true));

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

@@ -78,19 +78,19 @@ services:
         public: true
         class: Packagist\WebBundle\Entity\UserRepository
         factory: ['@doctrine', getRepository]
-        arguments: ['PackagistWebBundle:User']
+        arguments: ['Packagist\WebBundle\Entity\User']
 
     packagist.package_repository:
         public: true
         class: Packagist\WebBundle\Entity\PackageRepository
         factory: ['@doctrine', getRepository]
-        arguments: ['PackagistWebBundle:Package']
+        arguments: ['Packagist\WebBundle\Entity\Package']
 
     packagist.version_repository:
         public: true
         class: Packagist\WebBundle\Entity\VersionRepository
         factory: ['@doctrine', getRepository]
-        arguments: ['PackagistWebBundle:Version']
+        arguments: ['Packagist\WebBundle\Entity\Version']
         calls:
             - [ setRedis, [ '@snc_redis.cache_client' ]]
 
@@ -194,9 +194,7 @@ services:
         arguments: ['%algolia.app_id%', '%algolia.admin_key%']
         factory: ['Algolia\AlgoliaSearch\SearchClient', create]
 
-    packagist.queue_worker:
-        public: true
-        class: Packagist\WebBundle\Service\QueueWorker
+    Packagist\WebBundle\Service\QueueWorker:
         arguments:
             - "@snc_redis.default_client"
             - "@doctrine"

src/Packagist/WebBundle/Resources/views/forms.html.twig

@@ -6,16 +6,16 @@
 {% endblock textarea_widget %}
 
 {% block form_widget_simple %}
-{% spaceless %}
+{% filter spaceless %}
     {% set attr = attr|merge({'class': attr.class|default('') ~ ' form-control'}) %}
     {% set type = type|default('text') %}
 
     {{ parent() }}
-{% endspaceless %}
+{% endfilter %}
 {% endblock form_widget_simple %}
 
 {% block form_row %}
-{% spaceless %}
+{% filter spaceless %}
     <div class="form-group{% if errors|length > 0 %} has-error{% endif %}">
         {{ form_label(form) }}
 
@@ -31,15 +31,15 @@
             </span>
         {% endfor %}
     </div>
-{% endspaceless %}
+{% endfilter %}
 {% endblock form_row %}
 
 {% block form_errors %}
-{% spaceless %}
+{% filter spaceless %}
     {% if errors|length > 0 %}
         {% for error in errors %}
             <div class="alert alert-danger">{{ error.message }}</div>
         {% endfor %}
     {% endif %}
-{% endspaceless %}
+{% endfilter %}
 {% endblock form_errors %}

src/Packagist/WebBundle/Tests/Controller/FeedControllerTest.php

@@ -22,10 +22,10 @@ class FeedControllerTest extends WebTestCase
         $crawler = $client->request('GET', $url);
 
         $this->assertEquals(200, $client->getResponse()->getStatusCode(), $client->getResponse()->getContent());
-        $this->assertContains($format, $client->getResponse()->getContent());
+        $this->assertStringContainsString($format, $client->getResponse()->getContent());
 
         if ($vendor !== null) {
-            $this->assertContains($vendor, $client->getResponse()->getContent());
+            $this->assertStringContainsString($vendor, $client->getResponse()->getContent());
         }
 
     }

src/Packagist/WebBundle/Tests/Package/SymlinkDumperTest.php

@@ -9,14 +9,14 @@ class SymlinkDumperTest extends TestCase
 {
     private $mockDumper;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->mockDumper = $this->getMockBuilder(SymlinkDumper::class)
             ->disableOriginalConstructor()
             ->getMock();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->mockDumper = null;
     }

src/Packagist/WebBundle/Tests/Package/UpdaterTest.php

@@ -35,7 +35,7 @@ class UpdaterTest extends TestCase
     /** @var VcsDriverInterface|PHPUnit_Framework_MockObject_MockObject */
     private $driverMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -82,7 +82,7 @@ class UpdaterTest extends TestCase
 
         $this->updater->update($this->ioMock, $this->config, $this->package, $this->repositoryMock);
 
-        self::assertContains('This is the readme', $this->package->getReadme());
+        $this->assertStringContainsString('This is the readme', $this->package->getReadme());
     }
 
     public function testConvertsMarkdownForReadme()

src/Packagist/WebBundle/Twig/PackagistExtension.php

@@ -5,7 +5,7 @@ namespace Packagist\WebBundle\Twig;
 use Packagist\WebBundle\Model\ProviderManager;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
-class PackagistExtension extends \Twig_Extension
+class PackagistExtension extends \Twig\Extension\AbstractExtension
 {
     /**
      * @var ProviderManager