Merge branch 'fgerards_master'

# Conflicts: # composer.json # ext_emconf.php
Andreas-Sommer · Sep 26, 2023 · cd85db6 · cd85db6
2 parents 6fb34ca + 24c5304
commit cd85db6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/Classes/ViewHelpers/CountriesViewHelper.php b/Classes/ViewHelpers/CountriesViewHelper.php
@@ -21,7 +21,7 @@ class CountriesViewHelper extends AbstractViewHelper
 	public function initialize()
 	{
 		parent::initialize();
-		$this->countryRepository = ObjectUtility::getObjectManager()->get(CountryRepository::class);
+		$this->countryRepository = GeneralUtility::makeInstance(CountryRepository::class);
 	}
 
 	/**
@@ -60,9 +60,7 @@ public function render(): array
 				break;
 			case 3:
 				/** @var TerritoryRepository $territoryRepository */
-				$territoryRepository = ObjectUtility::getObjectManager()->get(
-					TerritoryRepository::class
-				);
+				$territoryRepository = GeneralUtility::makeInstance(TerritoryRepository::class);
 				$territories = $territoryRepository
 					->findAllByUidInList($field->getTerritories())->toArray();
 				$countries = $this->findByTerritories($territories);

diff --git a/composer.json b/composer.json
@@ -10,19 +10,15 @@
     ],
     "license": "GPL-2.0-or-later",
     "require": {
-        "typo3/cms-core": "^10.4",
-        "in2code/powermail": ">=8.0.0 <9.0.0",
-        "sjbr/static-info-tables": "6.9.6"
+        "typo3/cms-core": "^10.4 || ^11.5",
+        "in2code/powermail": ">=8.0.0 <=10.9.99",
+        "sjbr/static-info-tables": ">=6.9.6"
     },
     "autoload": {
         "psr-4": {
             "Belsignum\\PowermailCountry\\": "Classes"
         }
     },
-    "replace": {
-        "belsignum/powermail_country": "self.version",
-        "typo3-ter/powermail-country": "self.version"
-    },
     "extra": {
         "typo3/cms": {
             "extension-key": "powermail_country"

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -6,13 +6,13 @@
     'category' => 'plugin',
     'author' => 'Andreas Sommer',
     'author_email' => 'sommer@belsignum.com',
-    'state' => 'beta',
-    'version' => '10.0.1',
+    'state' => 'stable',
+    'version' => '11.0.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '10.4.0-10.4.99',
-			'powermail' => '8.0.0-8.9.99',
-			'static_info_tables' => '6.9.6'
+            'typo3' => '10.4.0-11.5.99',
+			'powermail' => '8.0.0-10.9.99',
+			'static_info_tables' => '6.9.6-11.5.99'
         ],
         'conflicts' => [],
         'suggests' => [],