Modern PHP

Upgrade coding style for modern PHP

.editorconfig

@@ -13,19 +13,14 @@ trim_trailing_whitespace = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.{yml,js,json,css,scss,eslintrc,feature}]
+[*.{yml,js,json,css,scss,feature}]
 indent_size = 2
 indent_style = space
 
 [composer.json]
 indent_size = 4
 
 # Don't perform any clean-up on thirdparty files
-
 [thirdparty/**]
 trim_trailing_whitespace = false
 insert_final_newline = false
-
-[admin/thirdparty/**]
-trim_trailing_whitespace = false
-insert_final_newline = false

phpcs.xml.dist

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="SilverStripe">
+	<description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
+
+	<file>src</file>
+    <file>tests</file>
+
+	<!-- base rules are PSR-2 -->
+	<rule ref="PSR2" >
+		<!-- Current exclusions -->
+		<exclude name="PSR1.Methods.CamelCapsMethodName" />
+		<exclude name="PSR2.Classes.PropertyDeclaration.Underscore" />
+		<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
+		<exclude name="Generic.Files.LineLength.TooLong" />
+		<exclude name="PSR1.Files.SideEffects.FoundWithSymbols" />
+	</rule>
+
+	<!-- use short array syntax -->
+	<rule ref="Generic.Arrays.DisallowLongArraySyntax" />
+</ruleset>
+

src/ArrayBulkLoaderSource.php

@@ -11,19 +11,16 @@
 class ArrayBulkLoaderSource extends BulkLoaderSource
 {
 
-    protected $data;
-
-    public function __construct($data)
+    public function __construct(protected $data)
     {
-        $this->data = $data;
     }
 
     public function getIterator(): ArrayIterator
     {
         return new ArrayIterator($this->data);
     }
 
-    public function setData($data)
+    public function setData($data): static
     {
         $this->data = $data;