.github/workflows/ci.yml

@@ -15,12 +15,12 @@ on:
 
 
 jobs:
-  silverstripe_5_php81:
+  silverstripe_411_php74:
-    name: "Silverstripe 5.0 | PHP 8.1"
+    name: "Silverstripe 4.11 | PHP 7.4"
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
     env:
-      php_version: 8.1
+      php_version: 7.4
       php_extensions: ctype, dom, fileinfo, hash, intl, mbstring, session, simplexml, tokenizer, xml, pdo, mysqli, gd, zip
     services:
       mysql:
@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Setup PHP Extension Cache
         id: cache-env
@@ -46,7 +46,7 @@ jobs:
           key: php74-ext-cache-${{ hashFiles('.github/workflows/ci.yml') }}
 
       - name: Cache PHP Extensions
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}
@@ -59,18 +59,18 @@ jobs:
           extensions: ${{ env.php_extensions }}
           ini-values: log_errors=On, error_log="${{github.workspace}}/artifacts/php_errors.log"
           coverage: none
-          tools: composer:v2
+          tools: composer:v1
 
       - name: Get composer cache directory
         id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-ss5-php81-${{ hashFiles('**/composer.json') }}-${{ hashFiles('.github/workflows/ci.yml') }}
+          key: ${{ runner.os }}-composer-ss411-php74-${{ hashFiles('**/composer.json') }}-${{ hashFiles('.github/workflows/ci.yml') }}
-          restore-keys: ${{ runner.os }}-composer-ss5-php81-
+          restore-keys: ${{ runner.os }}-composer-ss411-php74-
 
       - name: Install Composer dependencies
         env:
@@ -78,11 +78,8 @@ jobs:
         run: |
           composer self-update --ansi || true
           if [[ $GITHUB_ACCESS_TOKEN ]]; then composer config --ansi -g github-oauth.github.com $GITHUB_ACCESS_TOKEN; fi
-          composer config allow-plugins.composer/installers true
+          composer require silverstripe/admin 1.11.* --no-update
-          composer config allow-plugins.silverstripe/recipe-plugin true
+          composer require silverstripe/versioned 1.11.*
-          composer config allow-plugins.silverstripe/vendor-plugin true
-          composer require silverstripe/admin 2.0.* --no-update
-          composer require silverstripe/versioned 2.0.*
           composer install --verbose --no-interaction --no-progress --no-suggest --optimize-autoloader --ansi
 
       - name: Configure Environment
@@ -115,7 +112,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Setup PHP Extension Cache
         id: cache-env
@@ -126,7 +123,7 @@ jobs:
           key: php80-ext-cache-${{ hashFiles('.github/workflows/ci.yml') }}
 
       - name: Cache PHP Extensions
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}
@@ -143,10 +140,10 @@ jobs:
 
       - name: Get composer cache directory
         id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-ss411-php80-${{ hashFiles('**/composer.json') }}-${{ hashFiles('.github/workflows/ci.yml') }}
@@ -180,12 +177,12 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
     env:
-      php_version: 8.0
+      php_version: 7.4
       php_extensions: ctype, dom, fileinfo, hash, intl, mbstring, session, simplexml, tokenizer, xml, pdo, mysqli, gd, zip
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Setup PHP Extension Cache
         id: cache-env
@@ -196,7 +193,7 @@ jobs:
           key: php74-ext-cache-${{ hashFiles('.github/workflows/ci.yml') }}
 
       - name: Cache PHP Extensions
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}
@@ -213,10 +210,10 @@ jobs:
 
       - name: Get composer cache directory
         id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-phpcs-${{ hashFiles('.github/workflows/ci.yml') }}

CHANGELOG.md

@@ -1,8 +1,5 @@
 # Change Log
 
-## [2.2.0](https://github.com/UndefinedOffset/SortableGridField/tree/2.2.0) (2023-05-08)
-[Full Changelog](https://github.com/UndefinedOffset/SortableGridField/compare/2.1.0...2.2.0)
-
 ## [2.1.0](https://github.com/UndefinedOffset/SortableGridField/tree/2.1.0) (2022-07-06)
 [Full Changelog](https://github.com/UndefinedOffset/SortableGridField/compare/2.0.9...2.1.0)
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2023, Ed Chipman
+Copyright (c) 2022, Ed Chipman
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

composer.json

@@ -12,8 +12,9 @@
 		}
 	],
 	"require": {
-		"silverstripe/framework": "~4.11 | ^5",
+		"silverstripe/framework": "~4.11",
-		"silverstripe/versioned": "^1 | ^2"
+		"silverstripe/versioned": "^1.0",
+        "silverstripe/vendor-plugin": "^1.0"
 	},
     "require-dev": {
         "phpunit/phpunit": "^9.5",

src/Forms/GridFieldSortableRows.php

@@ -223,7 +223,7 @@ class GridFieldSortableRows extends AbstractGridFieldComponent implements GridFi
         $list = clone $dataList;
         $list = $list->alterDataQuery(function ($query, SS_List $tmplist) {
             /** @var \SilverStripe\ORM\DataQuery $query */
-            $query->limit(null);
+            $query->limit([]);
             return $query;
         });
 

tests/PHPUnit/Forms/AutoSortTest.php

@@ -111,7 +111,7 @@ class AutoSortTest extends SapphireTest
 
         //Publish all records
         foreach ($list as $item) {
-            $item->publishSingle();
+            $item->publish('Stage', 'Live');
         }
 
 
@@ -168,7 +168,7 @@ class AutoSortTest extends SapphireTest
 
         //Publish all records
         foreach ($list as $item) {
-            $item->publishSingle();
+            $item->publish('Stage', 'Live');
         }
 
 

tests/PHPUnit/Forms/OrderingTest.php

@@ -1,7 +1,6 @@
 <?php
 namespace UndefinedOffset\SortableGridField\Tests;
 
-use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Dev\SapphireTest;
@@ -10,8 +9,7 @@ use SilverStripe\Forms\Form;
 use SilverStripe\Forms\GridField\GridField;
 use SilverStripe\Forms\GridField\GridFieldConfig;
 use SilverStripe\ORM\ValidationException;
-use SilverStripe\Security\IdentityStore;
+use SilverStripe\Security\Member;
-use SilverStripe\Security\Security;
 use SilverStripe\Versioned\Versioned;
 use UndefinedOffset\SortableGridField\Forms\GridFieldSortableRows;
 use UndefinedOffset\SortableGridField\Tests\Forms\AutoSortTest\DummyController;
@@ -50,8 +48,8 @@ class OrderingTest extends SapphireTest
 
     public function testSortActionWithoutCorrectPermission()
     {
-        if (Security::getCurrentUser()) {
+        if (Member::currentUser()) {
-            Injector::inst()->get(IdentityStore::class)->logOut(Controller::curr()->getRequest());
+            Member::currentUser()->logOut();
         }
 
         $this->expectException(ValidationException::class);
@@ -99,7 +97,7 @@ class OrderingTest extends SapphireTest
 
         //Publish all records
         foreach ($list as $item) {
-            $item->publishSingle();
+            $item->publish('Stage', 'Live');
         }
 
         $team1 = $this->objFromFixture(VTeam::class, 'team1');

tests/PHPUnit/Forms/PageSortingTest.php

@@ -107,7 +107,7 @@ class PageSortingTest extends SapphireTest
 
         //Publish all records
         foreach ($list as $item) {
-            $item->publishSingle();
+            $item->publish('Stage', 'Live');
         }
 
 
@@ -154,7 +154,7 @@ class PageSortingTest extends SapphireTest
 
         //Publish all records
         foreach ($list as $item) {
-            $item->publishSingle();
+            $item->publish('Stage', 'Live');
         }
 
 

tests/utils/actions.env.template

@@ -1,7 +1,7 @@
 SS_ENVIRONMENT_TYPE="dev"
 SS_TRUSTED_PROXY_IPS="*"
 
-SS_DATABASE_CLASS="MySQLDatabase"
+SS_DATABASE_CLASS="MySQLPDODatabase"
 SS_DATABASE_SERVER="127.0.0.1"
 SS_DATABASE_USERNAME="root"
 SS_DATABASE_PASSWORD="testpassword"