[BUGFIX] Properly parse Country property in CountrySelectViewHelper

The implementation of #99911 missed to address that the
`<f:form.countrySelect>` ViewHelper needs to properly evaluate
the Country object, when referenced as a domain model property
instead of getting accessed via `value`.

This patch adds a test for this case and adapts retrieval
in the ViewHelper's `convertToPlainValue()` method.

Also, a drive-by typo is fixed.

Resolves: #107200
Related: #99911
Related: #104997
Releases: main
Change-Id: Ibf202c21a70d96303b188d7a5ad4fd45e055f263
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/90238
Tested-by: Garvin Hicking <garvin@hick.ing>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Simon Praetorius <simon@praetorius.me>
Reviewed-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
Tested-by: Simon Praetorius <simon@praetorius.me>
Tested-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Garvin Hicking <garvin@hick.ing>

Author: garvinhicking

typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/TcaTypeCountryTest.php

@@ -24,8 +24,12 @@
 use TYPO3\CMS\Core\Country\CountryProvider;
 use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
+use TYPO3\CMS\Extbase\Mvc\ExtbaseRequestParameters;
+use TYPO3\CMS\Extbase\Mvc\Request;
 use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
+use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextFactory;
 use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
+use TYPO3Fluid\Fluid\View\TemplateView;
 use TYPO3Tests\BlogExample\Domain\Model\Person;
 use TYPO3Tests\BlogExample\Domain\Repository\PersonRepository;
 
@@ -44,6 +48,28 @@ protected function setUp(): void
         $this->get(ConfigurationManagerInterface::class)->setRequest($request);
     }
 
+    #[Test]
+    public function tcaTypeCountryCanBeMappedForFormUsage(): void
+    {
+        $countryProvider = $this->get(CountryProvider::class);
+        $person = new Person();
+        $person->setCountry($countryProvider->getByAlpha2IsoCode('DE'));
+
+        $serverRequest = (new ServerRequest())
+            ->withAttribute('extbase', new ExtbaseRequestParameters())
+            ->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_BE);
+        $context = $this->get(RenderingContextFactory::class)->create([], new Request($serverRequest));
+        $context->getTemplatePaths()->setTemplateSource('
+            <f:form object="{person}" objectName="person">
+                <f:form.countrySelect name="country" property="country" onlyCountries="{0: \'CH\', 1: \'AT\', 2: \'DE\'}"  />
+            </f:form>
+        ');
+        $templateView = (new TemplateView($context));
+        $templateView->assign('person', $person);
+        $result = $templateView->render();
+        self::assertStringContainsString('<option value="DE" selected="selected">', $result);
+    }
+
     #[Test]
     public function tcaTypeCountryCanBeHandled(): void
     {

typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php

@@ -318,7 +318,7 @@ protected function getPropertyValue()
 
     /**
      * Internal method which checks if we should evaluate a domain object or just output arguments['name']
-     * and arguments['value']. Returns true if domoin object should be evaluated.
+     * and arguments['value']. Returns true if domain object should be evaluated.
      */
     protected function isObjectAccessorMode(): bool
     {

typo3/sysext/fluid/Classes/ViewHelpers/Form/CountrySelectViewHelper.php

@@ -192,4 +192,20 @@ protected function getCountryList(): array
             ->setExcludeCountries($this->arguments['excludeCountries'] ?? []);
         return GeneralUtility::makeInstance(CountryProvider::class)->getFiltered($filter);
     }
+
+    /**
+     * Converts an arbitrary value to a plain value.
+     * Evaluates possible direct "Country" type properties.
+     *
+     * @param mixed $value The value to convert
+     * @return mixed
+     */
+    protected function convertToPlainValue($value)
+    {
+        if ($value instanceof Country) {
+            return $value->getAlpha2IsoCode();
+        }
+        return parent::convertToPlainValue($value);
+    }
+
 }