v2: Silverstripe 5 support

Author: chrispenny

.github/workflows/main.yml

@@ -6,4 +6,4 @@ on:
 
 jobs:
   ci:
-    uses: silverstripe/github-actions-ci-cd/.github/workflows/ci.yml@v0.1
+    uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

composer.json

@@ -16,13 +16,12 @@
     "issues": "https://github.com/chrispenny/silverstripe-dataobject-to-fixture/issues"
   },
   "require": {
-    "php": "^7.4 || ^8.0",
-    "silverstripe/vendor-plugin": "^1.0",
-    "silverstripe/framework": "^4.8",
-    "silverstripe/cms": "^4.8"
+    "php": "^8.1",
+    "silverstripe/framework": "^5",
+    "silverstripe/cms": "^5"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.5",
+    "silverstripe/recipe-testing": "^3",
     "slevomat/coding-standard": "^8"
   },
   "autoload": {

phpcs.xml.dist

@@ -142,6 +142,9 @@
         <!-- Complexity check often fails at getCMSFields(). -->
         <!-- Each team/project can decide if they'd prefer to just tweak the complexity level rather than exclude this rule -->
         <exclude name="SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh"/>
+        <!-- Don't require alphabetical array keys -->
+        <exclude name="SlevomatCodingStandard.Arrays.AlphabeticallySortedByKeys.IncorrectKeyOrder"/>
+        <exclude name="SlevomatCodingStandard.Classes.RequireSelfReference.RequiredSelfReference"/>
     </rule>
 
     <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">

src/Manifest/FixtureManifest.php

@@ -31,10 +31,7 @@ public function getGroupByClassName(string $className): ?Group
         return $this->groups[$className];
     }
 
-    /**
-     * @param string|int $id
-     */
-    public function getRecordByClassNameId(string $className, $id): ?Record
+    public function getRecordByClassNameId(string $className, string|int $id): ?Record
     {
         $group = $this->getGroupByClassName($className);
 

src/ORM/Group.php

@@ -9,16 +9,13 @@ class Group
 
     use Injectable;
 
-    private ?string $className;
-
     /**
      * @var array|Record[]
      */
     private array $records = [];
 
-    public function __construct(string $className)
+    public function __construct(private readonly string $className)
     {
-        $this->className = $className;
     }
 
     public function getClassName(): string
@@ -34,10 +31,7 @@ public function getRecords(): array
         return $this->records;
     }
 
-    /**
-     * @param mixed $id
-     */
-    public function getRecordById($id): ?Record
+    public function getRecordById(string|int $id): ?Record
     {
         if (!array_key_exists($id, $this->records)) {
             return null;

src/ORM/Record.php

@@ -9,25 +9,13 @@ class Record
 
     use Injectable;
 
-    /**
-     * @var int|string|null
-     */
-    private $id;
-
     private array $fields = [];
 
-    /**
-     * @param mixed $id
-     */
-    public function __construct($id)
+    public function __construct(private readonly string|int $id)
     {
-        $this->id = $id;
     }
 
-    /**
-     * @return int|string|null
-     */
-    public function getId()
+    public function getId(): string|int
     {
         return $this->id;
     }
@@ -37,10 +25,7 @@ public function getFields(): array
         return $this->fields;
     }
 
-    /**
-     * @param mixed $value
-     */
-    public function addFieldValue(string $fieldName, $value): Record
+    public function addFieldValue(string $fieldName, mixed $value): Record
     {
         $this->fields[$fieldName] = $value;
 

src/Service/FixtureService.php

@@ -545,10 +545,9 @@ private function findOrCreateGroupByClassName(string $className): Group
     }
 
     /**
-     * @param string|int $id
      * @throws Exception
      */
-    private function findOrCreateRecordByClassNameId(string $className, $id): Record
+    private function findOrCreateRecordByClassNameId(string $className, string|int $id): Record
     {
         $group = $this->findOrCreateGroupByClassName($className);
 

src/Task/GenerateFixtureFromDataObject.php

@@ -22,7 +22,7 @@ class GenerateFixtureFromDataObject extends BuildTask
 
     protected $description = 'Generate a text fixture from a DataObject in your Database'; // phpcs:ignore
 
-    private static $segment = 'generate-fixture-from-dataobject'; // phpcs:ignore
+    private static string $segment = 'generate-fixture-from-dataobject'; // phpcs:ignore
 
     private ?int $previousExecution = null;