Merge branch '2.6' into 2

.upgrade.yml

@@ -0,0 +1,15 @@
+mappings:
+  BasicRestfulAuthenticator: SilverStripe\RestfulServer\BasicRestfulAuthenticator
+  RestfulServer: SilverStripe\RestfulServer\RestfulServer
+  RestfulServerItem: SilverStripe\RestfulServer\RestfulServerItem
+  RestfulServerList: SilverStripe\RestfulServer\RestfulServerList
+  RestfulServerTest: SilverStripe\RestfulServer\Tests\RestfulServerTest
+  RestfulServerTestAuthor: SilverStripe\RestfulServer\Tests\Stubs\RestfulServerTestAuthor
+  RestfulServerTestAuthorRating: SilverStripe\RestfulServer\Tests\Stubs\RestfulServerTestAuthorRating
+  RestfulServerTestComment: SilverStripe\RestfulServer\Tests\Stubs\RestfulServerTestComment
+  RestfulServerTestPage: SilverStripe\RestfulServer\Tests\Stubs\RestfulServerTestPage
+  RestfulServerTestSecretThing: SilverStripe\RestfulServer\Tests\Stubs\RestfulServerTestSecretThing
+  DataFormatter: SilverStripe\RestfulServer\DataFormatter
+  FormEncodedDataFormatter: SilverStripe\RestfulServer\DataFormatter\FormEncodedDataFormatter
+  JSONDataFormatter: SilverStripe\RestfulServer\DataFormatter\JSONDataFormatter
+  XMLDataFormatter: SilverStripe\RestfulServer\DataFormatter\XMLDataFormatter

composer.json

@@ -19,13 +19,13 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "silverstripe/framework": "^5"
+        "php": "^7.4 || ^8.0",
+        "silverstripe/framework": "^4.10"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3",
-        "silverstripe/versioned": "^2"
+        "squizlabs/php_codesniffer": "^3.0",
+        "silverstripe/versioned": "^1"
     },
     "autoload": {
         "psr-4": {