From a949bf569451e28711b677e55430b30474938d45 Mon Sep 17 00:00:00 2001
From: Mark Niebergall <mniebergall@nucleussec.com>
Date: Fri, 16 Sep 2022 15:43:28 -0600
Subject: [PATCH 1/3] feature/arrays new section clarifying array usage

---
 spec.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/spec.md b/spec.md
index a26ea89..1131464 100644
--- a/spec.md
+++ b/spec.md
@@ -1317,6 +1317,45 @@ function allowed()
 }
 ```
 
+## 12. Arrays
+
+Arrays MUST be declared using the short array syntax.
+
+```php
+<?php
+
+$arr = [];
+```
+
+Arrays MUST follow the trailing comma guidelines.
+
+Array declarations MAY be split across multiple lines, where each subsequent line 
+is indented once. When doing so, the first value in the array MUST be on the 
+next line, and there MUST be only one value per line.
+
+When the array declaration is split across multiple lines, the opening bracket 
+MUST be placed on the same line as the equals sign. The closing bracket 
+MUST be placed on the next line after the last value. There MUST NOT be more 
+than one value assignment per line. Value assignments MAY use a single line
+or multiple lines.
+
+```php
+<?php
+
+$arr1 = ['single', 'line', 'declaration'];
+
+$arr2 = [
+    'multi',
+    'line',
+    'declaration',
+    ['values' => 1, 5, 7],
+    [
+        'nested',
+        'array',
+    ],
+];
+```
+
 [PSR-1]: https://www.php-fig.org/psr/psr-1/
 [PSR-12]: https://www.php-fig.org/psr/psr-12/
 [keywords]: http://php.net/manual/en/reserved.keywords.php

From df7814371c0e2f7aacc43c73cdd008d5be45a206 Mon Sep 17 00:00:00 2001
From: Mark Niebergall <mniebergall@nucleussec.com>
Date: Sat, 17 Sep 2022 16:39:27 -0600
Subject: [PATCH 2/3] feature/arrays changed section from 12 to 11; can resolve
 to 12 if Attributes is merged before

---
 spec.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec.md b/spec.md
index 1131464..1466017 100644
--- a/spec.md
+++ b/spec.md
@@ -1317,7 +1317,7 @@ function allowed()
 }
 ```
 
-## 12. Arrays
+## 11. Arrays
 
 Arrays MUST be declared using the short array syntax.
 

From 9b25548f4b8868b51e7cd77a2691520023221edc Mon Sep 17 00:00:00 2001
From: Korvin Szanto <Korvinszanto@gmail.com>
Date: Thu, 10 Nov 2022 14:17:48 -0800
Subject: [PATCH 3/3] Fix merge, close code sample in section 11

---
 spec.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec.md b/spec.md
index ebba9d1..af84efb 100644
--- a/spec.md
+++ b/spec.md
@@ -1394,6 +1394,7 @@ $arr2 = [
         'array',
     ],
 ];
+```
 
 ## 12. Attributes