fix: update tests

composer.json

@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "keywords": ["silverstripe","payment","omnipay"],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "silverstripe/framework": "^5",
         "omnipay/common": "^3"
     },

phpunit.xml.dist

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" convertDeprecationsToExceptions="false">
   <coverage includeUncoveredFiles="true">
     <include>
       <directory suffix=".php">src/</directory>

tests/BasePurchaseServiceTest.php

@@ -737,7 +737,7 @@ protected function buildPaymentGatewayStub($endpoint, Closure $successFunc, $sen
 
         $mockPaymentResponse->expects($this->any())
             ->method('getRedirectResponse')
-            ->will($this->returnValue(RedirectResponse::create($endpoint)));
+            ->will($this->returnValue(new RedirectResponse($endpoint)));
 
         $mockPaymentRequest = $this->getMockBuilder('Omnipay\PaymentExpress\Message\PxPayPurchaseRequest')
             ->disableOriginalConstructor()->getMock();

tests/PaymentMathTest.php

@@ -18,9 +18,7 @@ public function setUp(): void
         Config::modify()->set(PaymentMath::class, 'useBcMath', true);
     }
 
-    /**
-      * @doesNotPerformAssertions
-      */
+
     public function testPrecision()
     {
         if (!function_exists('bcsub')) {
@@ -45,6 +43,7 @@ public function testPrecision()
         $this->assertEquals('0.499000000000000', PaymentMath::add('0.273', '0.226'));
     }
 
+
     public function testPrecisionFloat()
     {
         Config::modify()->set(PaymentMath::class, 'useBcMath', false);
@@ -70,9 +69,7 @@ public function testPrecisionFloat()
         $this->assertEquals('0.4990000000000', PaymentMath::add('0.273', '0.226'));
     }
 
-    /**
-      * @doesNotPerformAssertions
-      */
+
     public function testSubtraction()
     {
         if (!function_exists('bcsub')) {
@@ -114,9 +111,7 @@ public function testSubtractionFloat()
         $this->assertEquals('45.9990', $result);
     }
 
-    /**
-      * @doesNotPerformAssertions
-      */
+
     public function testAddition()
     {
         if (!function_exists('bcadd')) {

tests/PaymentModelTest.php

@@ -4,6 +4,7 @@
 
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Forms\FieldList;
 use SilverStripe\i18n\i18n;
 use SilverStripe\Omnipay\GatewayInfo;
 use SilverStripe\Omnipay\Model\Payment;
@@ -33,13 +34,12 @@ public function testParameterSetup()
         $this->assertEquals("Manual", $payment->Gateway);
     }
 
-    /**
-      * @doesNotPerformAssertions
-      */
+
     public function testCMSFields()
     {
         $fields = Payment::create()->getCMSFields();
-        $this->markTestIncomplete('getCMSFields tests');
+
+        $this->assertInstanceOf(FieldList::class, $fields);
     }
 
     public function testTitle()

tests/i18nTest/_fakewebroot/i18nnonstandardmodule/_config.php

@@ -0,0 +1 @@
+<?php

tests/i18nTest/_fakewebroot/i18nnonstandardmodule/phpfile.php

@@ -0,0 +1 @@
+<?php

tests/i18nTest/_fakewebroot/i18nnonstandardmodule/template.ss

@@ -0,0 +1 @@
+<p></p>

tests/i18nTest/_fakewebroot/i18nnonstandardmodule/tests/NothingInHere.php

@@ -0,0 +1 @@
+<?php

tests/i18nTest/_fakewebroot/i18nothermodule/code/i18nOtherModule.php

@@ -0,0 +1,12 @@
+<?php
+
+class i18nOtherModule
+{
+    public function mymethod()
+    {
+        _t(
+            'i18nOtherModule.ENTITY',
+            'Other Module Entity'
+        );
+    }
+}

tests/i18nTest/_fakewebroot/i18nothermodule/code/i18nProviderClass.php

@@ -0,0 +1,23 @@
+<?php
+
+use SilverStripe\i18n\i18nEntityProvider;
+
+class i18nProviderClass implements i18nEntityProvider
+{
+    public function provideI18nEntities()
+    {
+        return [
+            'i18nProviderClass.TITLE' => 'My Provider Class',
+            'i18nProviderClass.PLURALS' => [
+                'comment' => 'Plural forms for the test class',
+                'one' => 'A class',
+                'other' => '{count} classes',
+            ],
+            'i18nProviderClass.OTHER_MODULE' => [
+                'comment' => 'Test string in another module',
+                'default' => 'i18ntestmodule string defined in i18nothermodule',
+                'module' => 'i18ntestmodule'
+            ],
+        ];
+    }
+}

tests/i18nTest/_fakewebroot/i18nothermodule/code/i18nTestModuleDecorator.php

@@ -0,0 +1,11 @@
+<?php
+
+use SilverStripe\ORM\DataExtension;
+
+class i18nTestModuleExtension extends DataExtension
+{
+
+    public static $db = [
+        'MyExtraField' => 'Varchar'
+    ];
+}

tests/i18nTest/_fakewebroot/i18nothermodule/lang/de.yml

@@ -0,0 +1,4 @@
+de:
+  i18nOtherModule:
+    ENTITY: Other Module Entity (de)
+    MAINTEMPLATE: Main Template Other Module (de)

tests/i18nTest/_fakewebroot/i18nothermodule/lang/en.yml

@@ -0,0 +1,4 @@
+en:
+  i18nOtherModule:
+    ENTITY: Other Module Entity
+    MAINTEMPLATE: Main Template Other Module

tests/i18nTest/_fakewebroot/i18nothermodule/templates/i18nOtherModule.ss

@@ -0,0 +1 @@
+<%t i18nOtherModule.MAINTEMPLATE "Main Template Other Module" %>

tests/i18nTest/_fakewebroot/i18ntestmodule/_config.php

@@ -0,0 +1 @@
+<?php

tests/i18nTest/_fakewebroot/i18ntestmodule/code/i18nTestModule.php

@@ -0,0 +1,27 @@
+<?php
+
+use SilverStripe\ORM\DataObject;
+use SilverStripe\Dev\TestOnly;
+
+class i18nTestModule extends DataObject implements TestOnly
+{
+    private static $db = [
+        'MyField' => 'Varchar',
+    ];
+
+    public function myMethod()
+    {
+        _t(
+            'i18nTestModule.ENTITY',
+            'Entity with "Double Quotes"',
+            'Comment for entity'
+        );
+    }
+}
+class i18nTestModule_Addition
+{
+    public function myAdditionalMethod()
+    {
+        _t('i18nTestModule.ADDITION', 'Addition');
+    }
+}

tests/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestNamespacedClass.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace i18nTest;
+
+class i18nTestNamespacedClass
+{
+
+}

tests/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/i18nTestSubModule.php

@@ -0,0 +1,9 @@
+<?php
+
+class i18nTestSubModule
+{
+    public function __construct()
+    {
+        _t('i18nTestModule.OTHERENTITY', 'Other Entity');
+    }
+}

tests/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/lang/de.yml

@@ -0,0 +1,4 @@
+de:
+  i18nTestModule:
+    PRIORITYNOTICE: High Module Priority (de)
+    OTHERENTITY: Other Entity (de)

tests/i18nTest/_fakewebroot/i18ntestmodule/code/subfolder/lang/en.yml

@@ -0,0 +1,3 @@
+en:
+  i18nTestModule:
+    OTHERENTITY: Other Entity

tests/i18nTest/_fakewebroot/i18ntestmodule/lang/de.yml

@@ -0,0 +1,16 @@
+de:
+  NONAMESPACE: Include Entity without Namespace (de)
+  REPLACEMENTNONAMESPACE: "My replacement no namespace: {replacement} (de)"
+  REPLACEMENTINCLUDENONAMESPACE: "My include replacement no namespace: {replacement} (de)"
+  LAYOUTTEMPLATENONAMESPACE: Layout Template no namespace (de)
+  i18nTestModule:
+    # Comment for entity
+    ENTITY: 'Entity with "Double Quotes" (de)'
+    ADDITION: Addition (de)
+    MAINTEMPLATE: Main Template (de)
+    WITHNAMESPACE: Include Entity with Namespace (de)
+    LAYOUTTEMPLATE: Layout Template (de)
+    REPLACEMENTNAMESPACE: "My replacement: {replacement} (de)"
+    PRIORITYNOTICE: Low Module Priority (de)
+  i18nTestModuleInclude_ss:
+    REPLACEMENTINCLUDENAMESPACE: "My include replacement: {replacement} (de)"

tests/i18nTest/_fakewebroot/i18ntestmodule/lang/de_AT.yml

@@ -0,0 +1,3 @@
+de_AT:
+  i18nTestModule:
+    ENTITY: 'Entity with "Double Quotes" (de_AT)'

tests/i18nTest/_fakewebroot/i18ntestmodule/lang/en.yml

@@ -0,0 +1,22 @@
+en:
+  NONAMESPACE: Include Entity without Namespace
+  REPLACEMENTNONAMESPACE: 'My replacement no namespace: {replacement}'
+  REPLACEMENTINCLUDENONAMESPACE: 'My include replacement no namespace: {replacement}'
+  LAYOUTTEMPLATENONAMESPACE: Layout Template no namespace
+  i18nTestModule:
+    # Comment for entity
+    ENTITY: 'Entity with "Double Quotes"'
+    ADDITION: Addition
+    MAINTEMPLATE: Main Template
+    WITHNAMESPACE: Include Entity with Namespace
+    LAYOUTTEMPLATE: Layout Template
+    REPLACEMENTNAMESPACE: 'My replacement: {replacement}'
+    PLURALS:
+      one: 'A test'
+      other: '{count} tests'
+  i18nTestModuleInclude_ss:
+    REPLACEMENTINCLUDENAMESPACE: "My include replacement: {replacement}"
+  Month:
+    PLURALS:
+      one: 'A month'
+      other: '{count} months'

tests/i18nTest/_fakewebroot/i18ntestmodule/lang/en_GB.yml

@@ -0,0 +1,15 @@
+en:
+  NONAMESPACE: Include Entity without Namespace
+  REPLACEMENTNONAMESPACE: "My replacement no namespace: {replacement}"
+  REPLACEMENTINCLUDENONAMESPACE: "My include replacement no namespace: {replacement}"
+  LAYOUTTEMPLATENONAMESPACE: Layout Template no namespace
+  i18nTestModule:
+    # Comment for entity
+    ENTITY: 'Entity with "Double Quotes"'
+    ADDITION: Addition
+    MAINTEMPLATE: Main Template
+    WITHNAMESPACE: Include Entity with Namespace
+    LAYOUTTEMPLATE: Layout Template
+    REPLACEMENTNAMESPACE: "My replacement: {replacement}"
+  i18nTestModuleInclude_ss:
+    REPLACEMENTINCLUDENAMESPACE: "My include replacement: {replacement}"

tests/i18nTest/_fakewebroot/i18ntestmodule/lang/en_corrupt.yml

@@ -0,0 +1,5 @@
+en:
+  NONAMESPACE: Include Entity without Namespace
+  Invalid: Foo
+    About: 'About us'
+    - Invalid # this should throw "A colon cannot be used in an unquoted mapping value at line 5"

tests/i18nTest/_fakewebroot/i18ntestmodule/lang/es_AR.yml

@@ -0,0 +1,15 @@
+en:
+  NONAMESPACE: Include Entity without Namespace
+  REPLACEMENTNONAMESPACE: 'My replacement no namespace: {replacement}'
+  REPLACEMENTINCLUDENONAMESPACE: 'My include replacement no namespace: {replacement}'
+  LAYOUTTEMPLATENONAMESPACE: Layout Template no namespace
+  i18nTestModule:
+    # Comment for entity
+    ENTITY: Entity with "Double Quotes"
+    ADDITION: Addition
+    MAINTEMPLATE: Main Template
+    WITHNAMESPACE: Include Entity with Namespace
+    LAYOUTTEMPLATE: Layout Template
+    REPLACEMENTNAMESPACE: 'My replacement: {replacement}'
+  i18nTestModuleInclude_ss:
+    REPLACEMENTINCLUDENAMESPACE: 'My include replacement: {replacement}'

tests/i18nTest/_fakewebroot/i18ntestmodule/lang/es_ES.yml

@@ -0,0 +1,15 @@
+en:
+  NONAMESPACE: Include Entity without Namespace
+  REPLACEMENTNONAMESPACE: 'My replacement no namespace: {replacement}'
+  REPLACEMENTINCLUDENONAMESPACE: 'My include replacement no namespace: {replacement}'
+  LAYOUTTEMPLATENONAMESPACE: Layout Template no namespace
+  i18nTestModule:
+    # Comment for entity
+    ENTITY: Entity with "Double Quotes"
+    ADDITION: Addition
+    MAINTEMPLATE: Main Template
+    WITHNAMESPACE: Include Entity with Namespace
+    LAYOUTTEMPLATE: Layout Template
+    REPLACEMENTNAMESPACE: 'My replacement: {replacement}'
+  i18nTestModuleInclude_ss:
+    REPLACEMENTINCLUDENAMESPACE: 'My include replacement: {replacement}'

tests/i18nTest/_fakewebroot/i18ntestmodule/lang/fr.yml

@@ -0,0 +1,3 @@
+fr:
+  i18nTestModule:
+    ENTITY: 'Entity with "Double Quotes" (fr)'

tests/i18nTest/_fakewebroot/i18ntestmodule/lang/ja.yml

@@ -0,0 +1,4 @@
+ja:
+  Month:
+    PLURALS:
+      other: '{count}日'

tests/i18nTest/_fakewebroot/i18ntestmodule/lang/mi_NZ.yml

@@ -0,0 +1,3 @@
+mi_NZ:
+  i18nTestModule:
+    ENTITY: Translation (mi_NZ)

tests/i18nTest/_fakewebroot/i18ntestmodule/lang/pl.yml

@@ -0,0 +1,7 @@
+pl:
+  Month:
+    PLURALS:
+      one: '1 miesiąc'
+      few: '{count} miesiące'
+      many: '{count} miesięcy'
+      other: '{count} miesiąca'

tests/i18nTest/_fakewebroot/i18ntestmodule/templates/Includes/i18nTestModuleInclude.ss

@@ -0,0 +1,4 @@
+<%t i18nTestModule.WITHNAMESPACE 'Include Entity with Namespace' %>
+<%t NONAMESPACE 'Include Entity without Namespace' %>
+<%t i18nTestModuleInclude_ss.REPLACEMENTINCLUDENAMESPACE 'My include replacement: {replacement}' replacement=$TestProperty %>
+<%t REPLACEMENTINCLUDENONAMESPACE 'My include replacement no namespace: {replacement}' replacement=$TestProperty %>

tests/i18nTest/_fakewebroot/i18ntestmodule/templates/Layout/i18nTestModule.ss

@@ -0,0 +1,12 @@
+<%t i18nTestModule.LAYOUTTEMPLATE "Layout Template" %>
+<%t LAYOUTTEMPLATENONAMESPACE "Layout Template no namespace" %>
+<%t i18nTestModule.REPLACEMENTNAMESPACE 'My replacement: {replacement}' replacement=$TestProperty %>
+<%t REPLACEMENTNONAMESPACE 'My replacement no namespace: {replacement}' replacement=$TestProperty %>
+<% include i18nTestModuleInclude %>
+
+<%t i18nTestModule.NEWMETHODSIG "New _t method signature test" %>
+<%t i18nTestModule.INJECTIONS_DOES_NOT_EXIST "Hello {name} {greeting}. But it is late, {goodbye}" name="Mark" greeting="welcome" goodbye="bye" %>
+<%t i18nTestModule.INJECTIONS "Hello {name} {greeting}. But it is late, {goodbye}" name="Paul" greeting="good you are here" goodbye="see you" %>
+<%t i18nTestModule.INJECTIONS "Hello {name} {greeting}. But it is late, {goodbye}" is "New context (this should be ignored)" name="Steffen" greeting="willkommen" goodbye="wiedersehen" %>
+<%t i18nTestModule.INJECTIONS name="Cat" greeting='meow' goodbye="meow" %>
+<%t i18nTestModule.INJECTIONS name=$absoluteBaseURL greeting=$get_locale goodbye="global calls" %>

tests/i18nTest/_fakewebroot/i18ntestmodule/templates/i18nTestModule.ss

@@ -0,0 +1,7 @@
+<%t i18nTestModule.MAINTEMPLATE "Main Template" %>
+$Layout
+lonely _t() call that should be ignored
+<%t i18nTestModule.NEWENTITY "Not stored in master file yet" %>
+Single: <%t i18nTestModule.PLURALS 'An item|{count} items' count=1 %>
+Multiple: <%t i18nTestModule.PLURALS 'An item|{count} items' count=4 %>
+None: <%t i18nTestModule.PLURALS 'An item|{count} items' count=0 %>

tests/i18nTest/_fakewebroot/i18ntestmodule/tests/DontLook.php

@@ -0,0 +1 @@
+<?php

tests/i18nTest/_fakewebroot/notmodule/noop.php

@@ -0,0 +1 @@
+<?php

tests/i18nTest/_fakewebroot/themes/testtheme1/lang/de.yml

@@ -0,0 +1,11 @@
+de:
+  i18nTestTheme1:
+    LAYOUTTEMPLATE: Theme1 Layout Template (de)
+    REPLACEMENTNAMESPACE: 'Theme1 My replacement: {replacement} (de)'
+  i18nTestTheme1Include:
+    WITHNAMESPACE: Theme1 Include Entity with Namespace (de)
+    REPLACEMENTINCLUDENAMESPACE: 'Theme1 My include replacement: {replacement} (de)'
+  NONAMESPACE: Theme1 Include Entity without Namespace (de)
+  REPLACEMENTINCLUDENONAMESPACE: 'Theme1 My include replacement no namespace: {replacement} (de)'
+  LAYOUTTEMPLATENONAMESPACE: Theme1 Layout Template no namespace (de)
+  REPLACEMENTNONAMESPACE: 'Theme1 My replacement no namespace: {replacement} (de)'

tests/i18nTest/_fakewebroot/themes/testtheme1/lang/de_DE.php

@@ -0,0 +1,11 @@
+<?php
+
+global $lang;
+
+if (array_key_exists('de_DE', $lang ?? []) && is_array($lang['de_DE'])) {
+    $lang['de_DE'] = array_merge($lang['en_US'], $lang['de_DE']);
+} else {
+    $lang['de_DE'] = $lang['en_US'];
+}
+
+$lang['de_DE']['i18nOtherModule']['LEGACYTHEME'] = 'Legacy translation (de_DE)';