Merge pull request #18 from oxygen-cms/laravel10

upgrade to Laravel 10
oxygen-cms · Apr 1, 2024 · fc8dcb6 · fc8dcb6
2 parents 2ecfdaf + 0f01159
commit fc8dcb6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -14,9 +14,9 @@
         }
     ],
     "require": {
-        "php": ">=7.4.0",
-        "oxygen/data": "~0.11.0",
-        "laravel/framework": "~6.0",
+        "php": "^8.1",
+        "oxygen/data": "~0.12.0",
+        "laravel/framework": "^10.0",
         "twig/twig": "^3.0",
         "ueberdosis/tiptap-php": "^1.1",
         "ext-dom": "*"
@@ -45,7 +45,7 @@
     },
     "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"