From fa5a7bf19ef7564f7e7f4e72b5a18dd3e3da869b Mon Sep 17 00:00:00 2001
From: Chris Chamberlain <chris@chamberlain.id.au>
Date: Sun, 5 Nov 2023 17:40:06 +1100
Subject: [PATCH 1/3] laravel 10

---
 composer.json | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index a6e917d..cdcf761 100644
--- a/composer.json
+++ b/composer.json
@@ -14,9 +14,9 @@
         }
     ],
     "require": {
-        "php": ">=7.4.0",
-        "oxygen/data": "~0.11.0",
-        "laravel/framework": "~6.0",
+        "php": "^8.1",
+        "oxygen/data": "dev-laravel10",
+        "laravel/framework": "^10.0",
         "twig/twig": "^3.0",
         "ueberdosis/tiptap-php": "^1.1",
         "ext-dom": "*"
@@ -43,9 +43,15 @@
             ]
         }
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/oxygen-cms/data.git"
+        }
+    ],
     "require-dev": {
         "phpstan/phpstan": "^1.8",
-        "phpspec/phpspec": "^6.1"
+        "phpspec/phpspec": "^7.0"
     },
     "scripts": {
         "test": "vendor/bin/phpspec run && vendor/bin/phpstan analyze src --level 2"

From d016b3c9ac0827ee987e11c80fbfc5bd0cd08b47 Mon Sep 17 00:00:00 2001
From: Chris Chamberlain <chris@chamberlain.id.au>
Date: Mon, 1 Apr 2024 16:55:04 +1100
Subject: [PATCH 2/3] bump gh workflows php version

---
 .github/workflows/php.yml | 2 +-
 composer.json             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index d6865a5..b58300e 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.1'
 
     - name: Validate composer.json and composer.lock
       run: composer validate
diff --git a/composer.json b/composer.json
index cdcf761..1d526b3 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "oxygen/data": "dev-laravel10",
+        "oxygen/data": "~0.12.0",
         "laravel/framework": "^10.0",
         "twig/twig": "^3.0",
         "ueberdosis/tiptap-php": "^1.1",

From 0f0115960ebaf4c104b85b65835120ddc6f1775e Mon Sep 17 00:00:00 2001
From: Chris Chamberlain <chris@chamberlain.id.au>
Date: Mon, 1 Apr 2024 16:58:50 +1100
Subject: [PATCH 3/3] remove data git repo

---
 composer.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/composer.json b/composer.json
index 1d526b3..8c33111 100644
--- a/composer.json
+++ b/composer.json
@@ -43,12 +43,6 @@
             ]
         }
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/oxygen-cms/data.git"
-        }
-    ],
     "require-dev": {
         "phpstan/phpstan": "^1.8",
         "phpspec/phpspec": "^7.0"