CMS 6 support

README.md

@@ -13,8 +13,8 @@ nutshell, it wraps the PHP Omnipay payments library and provides some additional
 omnipay, see: https://github.com/thephpleague/omnipay
 
 ## Requirements
- * PHP 8.1+
- * [silverstripe framework](https://github.com/silverstripe/silverstripe-framework) v5 + 
+ * PHP 8.3+
+ * [silverstripe framework](https://github.com/silverstripe/silverstripe-framework) v6 + 
  * [omnipay](https://github.com/omnipay/common) 3 & its dependencies - which include guzzle and some symphony libraries.
 
 ## Features

composer.json

@@ -5,14 +5,14 @@
     "license": "BSD-3-Clause",
     "keywords": ["silverstripe","payment","omnipay"],
     "require": {
-        "php": "^8.1",
-        "silverstripe/framework": "^5",
+        "php": "^8.3|^8.4",
+        "silverstripe/framework": "^6",
         "omnipay/common": "^3"
     },
     "require-dev": {
         "guzzlehttp/psr7": "^2.5",
         "silverstripe/versioned" : "*",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^11",
         "php-http/guzzle7-adapter": "^1",
         "omnipay/paypal": "^3",
         "omnipay/dummy": "^3",
@@ -28,7 +28,7 @@
     },
     "extra" : {
         "branch-alias": {
-            "dev-main": "4.x-dev"
+            "dev-main": "5.x-dev"
         }
     },
     "scripts": {

docs/en/GettingStarted.md

@@ -187,7 +187,7 @@ To do this, you'll need to introduce an extension that utilises the relevent ext
 For example:
 
 ```php
-class ShopPayment extends DataExtension {
+class ShopPayment extends Extension {
 
     private static $has_one = array(
         'Order' => 'Order'
@@ -212,7 +212,7 @@ This will add a has_many `Payment` relationship to your model, and provide some
 For example, the following extension will be applied to `Payment`:
 
 ```php
-class ShopPayment extends DataExtension {
+class ShopPayment extends Extension {
     private static $has_one = array(
         'Order' => 'Order'
     );

src/Extensions/Payable.php

@@ -2,9 +2,9 @@
 
 namespace SilverStripe\Omnipay\Extensions;
 
+use SilverStripe\Core\Extension;
 use SilverStripe\Omnipay\GatewayInfo;
 use SilverStripe\Omnipay\Model\Payment;
-use SilverStripe\ORM\DataExtension;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\HasManyList;
 
@@ -14,7 +14,7 @@
  * @property DataObject|Payable $owner
  * @method Payment[]|HasManyList Payments()
  */
-class Payable extends DataExtension
+class Payable extends Extension
 {
     private static $has_many = [
         'Payments' => Payment::class

src/Extensions/WorldPayResponseExtension.php

@@ -5,7 +5,7 @@
 use SilverStripe\Core\Extension;
 use SilverStripe\Control\Director;
 use SilverStripe\Omnipay\Service\ServiceResponse;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 use SilverStripe\View\SSViewer;
 use SilverStripe\Control\HTTPResponse;
 

src/Service/PaymentService.php

@@ -107,7 +107,7 @@ abstract public function complete($data = [], $isNotification = false);
      * Cancel a payment
      *
      * @throws \Exception
-     * @throws \SilverStripe\ORM\ValidationException
+     * @throws \SilverStripe\Core\Validation\ValidationException
      * @throws \SilverStripe\Omnipay\Exception\ServiceException
      * @return ServiceResponse
      */
@@ -316,7 +316,7 @@ protected function wrapOmnipayResponse(ResponseInterface $omnipayResponse, $isNo
      * @param string $endStatus the end state to set on the payment
      * @param ServiceResponse $serviceResponse the service response
      * @param mixed $gatewayMessage the message from Omnipay
-     * @throws \SilverStripe\ORM\ValidationException
+     * @throws \SilverStripe\Core\Validation\ValidationException
      */
     protected function markCompleted($endStatus, ServiceResponse $serviceResponse, $gatewayMessage)
     {

tests/Extensions/PaymentTestPaymentExtensionHooks.php

@@ -2,14 +2,14 @@
 
 namespace SilverStripe\Omnipay\Tests\Extensions;
 
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\Dev\TestOnly;
 
 /**
  * Extension that can be used to test payment hooks
  * @codeCoverageIgnore
  */
-class PaymentTestPaymentExtensionHooks extends DataExtension implements TestOnly
+class PaymentTestPaymentExtensionHooks extends Extension implements TestOnly
 {
     protected static $instances = [];
 

tests/Extensions/TestPaymentExtension.php

@@ -2,11 +2,11 @@
 
 namespace SilverStripe\Omnipay\Tests\Extensions;
 
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\Omnipay\Tests\Model\TestOrder;
 
-class TestPaymentExtension extends DataExtension implements TestOnly
+class TestPaymentExtension extends Extension implements TestOnly
 {
     private static $has_one = [
         'Test_Order' => TestOrder::class

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

@@ -1,8 +1,8 @@
 <?php
 
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 
-class i18nTestModuleExtension extends DataExtension
+class i18nTestModuleExtension extends Extension
 {
 
     public static $db = [

tests/i18nTestManifest.php

@@ -14,10 +14,10 @@
 use SilverStripe\i18n\Messages\Symfony\SymfonyMessageProvider;
 use SilverStripe\i18n\Messages\YamlReader;
 use SilverStripe\View\SSViewer;
-use SilverStripe\View\SSViewer_DataPresenter;
+use SilverStripe\TemplateEngine\ScopeManager;
 use SilverStripe\View\ThemeResourceLoader;
 use SilverStripe\View\ThemeManifest;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\ModelData;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 use Symfony\Component\Translation\Translator;
 
@@ -59,9 +59,9 @@ trait i18nTestManifest
 
     public function setupManifest()
     {
-        // force SSViewer_DataPresenter to cache global template vars before we switch to the
+        // force ScopeManager to cache global template vars before we switch to the
         // test-project class manifest (since it will lose visibility of core classes)
-        $presenter = new SSViewer_DataPresenter(new ViewableData());
+        $presenter = new ScopeManager(new ModelData());
         unset($presenter);
 
         // Switch to test manifest