Merge branch...

Merge branch '366-oops-an-error-occurred-on-https-extensions-typo3-org-extension-event' into 'develop'

Replace old class names

Closes #366

See merge request t3o/ter!374

html/typo3conf/ext/ter_fe2/Classes/Service/MirrorService.php

@@ -40,6 +40,19 @@ class MirrorService implements \TYPO3\CMS\Core\SingletonInterface
      */
     protected $mirrorUrl;
 
+    /**
+     * @var \TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository
+     */
+    protected $repositoryRepository;
+
+    /**
+     * @param \TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository $repositoryRepository
+     */
+    public function injectRepositoryRepository(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository $repositoryRepository)
+    {
+        $this->repositoryRepository = $repositoryRepository;
+    }
+
     /**
      * Setter for maxAttempts
      *
@@ -138,10 +151,12 @@ class MirrorService implements \TYPO3\CMS\Core\SingletonInterface
             }
 
             // Get mirrors from repository object
-            $repository = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_em_Repository', $emSettings['selectedRepository']);
+            $repository = $this->repositoryRepository->findByUid($emSettings['selectedRepository']);
             if ($repository->getMirrorListUrl()) {
-                $repositoryUtility = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_em_Repository_Utility', $repository);
-                $mirrors = $repositoryUtility->getMirrors(true)->getMirrors();
+                $repositoryUtility = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+                    \TYPO3\CMS\Extensionmanager\Utility\Importer\MirrorListUtility::class
+                );
+                $mirrors = $repositoryUtility->getMirrors($repository->getMirrorListUrl())->getMirrors();
                 unset($repositoryUtility);
                 if (!is_array($mirrors)) {
                     throw new \Exception('No mirrors found');