Removed callls to Controller::has_curr()

Updated namespaces used in GridFieldSortableRows

Removed GItHubActionsAnnotationPrinter

Author: UndefinedOffset

.github/workflows/ci.yml

@@ -89,10 +89,13 @@ jobs:
           cp tests/utils/actions.env.template .env
           mkdir artifacts
 
+      - name: Configure matchers
+        uses: mheap/phpunit-matcher-action@v1
+
       - name: Perform PHPUnit Tests
         env:
           SS_DATABASE_PORT: ${{ job.services.mysql.ports['3306'] }}
-        run: vendor/bin/phpunit --colors=always --printer UndefinedOffset\\SortableGridField\\Tests\\PHPUnit\\Bootstrap\\GitHubActionsAnnotatorPrinter
+        run: vendor/bin/phpunit --colors=always --teamcity test
 
   phpcs:
     name: "PHP_CodeSniffer"

src/Forms/GridFieldSortableRows.php

@@ -530,7 +530,7 @@ protected function saveGridRowSort(GridField $gridField, $data)
         //Event to notify the Controller or owner DataObject before list sort
         if ($owner && $owner instanceof DataObject && method_exists($owner, 'onBeforeGridFieldRowSort')) {
             $owner->onBeforeGridFieldRowSort(clone $items);
-        } else if (Controller::has_curr() && Controller::curr() instanceof ModelAdmin && method_exists(Controller::curr(), 'onBeforeGridFieldRowSort')) {
+        } else if (Controller::curr() instanceof ModelAdmin && method_exists(Controller::curr(), 'onBeforeGridFieldRowSort')) {
             Controller::curr()->onBeforeGridFieldRowSort(clone $items);
         }
 
@@ -591,7 +591,7 @@ protected function saveGridRowSort(GridField $gridField, $data)
         //Event to notify the Controller or owner DataObject after list sort
         if ($owner && $owner instanceof DataObject && method_exists($owner, 'onAfterGridFieldRowSort')) {
             $owner->onAfterGridFieldRowSort(clone $items);
-        } else if (Controller::has_curr() && Controller::curr() instanceof ModelAdmin && method_exists(Controller::curr(), 'onAfterGridFieldRowSort')) {
+        } else if (Controller::curr() instanceof ModelAdmin && method_exists(Controller::curr(), 'onAfterGridFieldRowSort')) {
             Controller::curr()->onAfterGridFieldRowSort(clone $items);
         }
     }
@@ -663,7 +663,7 @@ protected function sortToPage(GridField $gridField, $data)
         //Event to notify the Controller or owner DataObject before list sort
         if ($owner && $owner instanceof DataObject && method_exists($owner, 'onBeforeGridFieldPageSort')) {
             $owner->onBeforeGridFieldPageSort(clone $items);
-        } else if (Controller::has_curr() && Controller::curr() instanceof ModelAdmin && method_exists(Controller::curr(), 'onBeforeGridFieldPageSort')) {
+        } else if (Controller::curr() instanceof ModelAdmin && method_exists(Controller::curr(), 'onBeforeGridFieldPageSort')) {
             Controller::curr()->onBeforeGridFieldPageSort(clone $items);
         }
 
@@ -780,7 +780,7 @@ protected function sortToPage(GridField $gridField, $data)
         //Event to notify the Controller or owner DataObject after list sort
         if ($owner && $owner instanceof DataObject && method_exists($owner, 'onAfterGridFieldPageSort')) {
             $owner->onAfterGridFieldPageSort(clone $items);
-        } else if (Controller::has_curr() && Controller::curr() instanceof ModelAdmin && method_exists(Controller::curr(), 'onAfterGridFieldPageSort')) {
+        } else if (Controller::curr() instanceof ModelAdmin && method_exists(Controller::curr(), 'onAfterGridFieldPageSort')) {
             Controller::curr()->onAfterGridFieldPageSort(clone $items);
         }
     }

tests/PHPUnit/Bootstrap/GitHubActionsAnnotatorPrinter.php

@@ -4,12 +4,12 @@
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\FieldList;
 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\Security;
 use SilverStripe\Versioned\Versioned;