Merge pull request #1 from Power-Components/6.x

upgrade to V6

.gitattributes

@@ -0,0 +1,15 @@
+# https://mirrors.edge.kernel.org/pub/software/scm/git/docs/gitattributes.html
+
+.github                export-ignore
+/art                   export-ignore
+/tests                 export-ignore
+docker-compose.yml     export-ignore
+.gitattributes         export-ignore
+phpstan.neon           export-ignore
+phpunit.mysql.xml      export-ignore
+phpunit.pgsql.xml      export-ignore
+phpunit.xml            export-ignore
+pint.json              export-ignore
+postcss.config.js      export-ignore
+webpack.mix.js         export-ignore
+.bladeformatterrc.json export-ignore

.github/workflows/cypress.yml

@@ -0,0 +1,84 @@
+name: Cypress
+
+on:
+  push:
+    branches:
+      - "**"
+    paths-ignore:
+      - "art/**"
+      - "README.md"
+  pull_request:
+    types: [ready_for_review, synchronize, opened]
+    paths-ignore:
+      - "art/**"
+      - "README.md"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: powergridtest
+        ports:
+          - 3307:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+      postgres:
+        image: postgres:9.6
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: powergridtest
+        ports:
+          - 5433:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ 8.2 ]
+
+    name: PHP:${{ matrix.php }}
+
+    if: github.ref != 'refs/heads/todo-tests'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv
+          tools: composer:v2
+          coverage: none
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Build App
+        run: |
+          npm install
+          git clone https://github.com/Power-Components/powergrid-cypress-base.git tests/cypress/app
+          chmod +x ./tests/cypress/mysql.sh
+          chmod +x ./tests/cypress/pgsql.sh
+
+      - name: MySQL
+        run: |
+          ./tests/cypress/mysql.sh
+          cd ./tests/cypress/app && php artisan serve & sleep 5 &
+          cd ./tests/cypress && npx cypress run
+        shell: bash
+
+      - name: PostGreSQL
+        run: |
+          ./tests/cypress/pgsql.sh
+          cd ./tests/cypress/app && php artisan serve & sleep 5 &
+          cd ./tests/cypress && npx cypress run
+        shell: bash

.github/workflows/mysql.yml

@@ -30,11 +30,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.3, 8.2, 8.1 ]
-        laravel: [ 11.*, 10.* ]
-        exclude:
-          - php: 8.1
-            laravel: 11.*
+        php: [8.3, 8.2 ]
+        laravel: [ 11.* ]
         dependency-version: [ prefer-stable ]
 
     name: PHP:${{ matrix.php }} / L:${{ matrix.laravel }}

.github/workflows/phpstan.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.2 ]
+        php: [ 8.3 ]
         laravel: [ 11.* ]
         dependency-version: [ prefer-stable ]
 

.github/workflows/postgres.yml

@@ -31,8 +31,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.3, 8.2, 8.1 ]
-        laravel: [ 11.*, 10.* ]
+        php: [8.3, 8.2 ]
+        laravel: [ 11.* ]
         exclude:
           - php: 8.1
             laravel: 11.*

.github/workflows/sqlite.yml

@@ -19,8 +19,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.3, 8.2, 8.1 ]
-        laravel: [ 11.*, 10.* ]
+        php: [8.3, 8.2 ]
+        laravel: [ 11.* ]
         exclude:
           - php: 8.1
             laravel: 11.*

README.md

@@ -82,7 +82,7 @@ PowerGrid offers a range of features that are readily available:
 
 ### Requirements
 
-- PHP 8.1+
+- PHP 8.2+
 - [Laravel 10+](https://laravel.com/docs/installation)
 - [Livewire 3.0x](https://livewire.laravel.com)
 - [Tailwind 3x](https://tailwindcss.com/docs/guides/laravel) or [Bootstrap 5](https://getbootstrap.com/docs/5.0/getting-started/introduction/)

composer.json

@@ -18,26 +18,24 @@
     }
   ],
   "require": {
-    "php": "^8.1",
-    "livewire/livewire": "^3.4.6",
-    "laravel/prompts": "^0.1.15"
+    "php": "^8.2",
+    "livewire/livewire": "^3.5.0",
+    "laravel/prompts": "*"
   },
   "require-dev": {
-    "composer/composer": "^2.7.1",
-    "laravel/pint": "^1.14.0",
-    "laradumps/laradumps-core": "^2.0",
-    "larastan/larastan": "^2.9.0",
-    "pestphp/pest": "^2.34.0",
-    "orchestra/testbench": "8.19|^9.0",
-    "laradumps/laradumps": "^3.1",
-    "laravel/scout": "^10.9"
+    "composer/composer": "^2.7.9",
+    "laravel/pint": "1.17",
+    "laradumps/laradumps-core": "^2.2.2",
+    "larastan/larastan": "^2.9.8",
+    "pestphp/pest": "^2.35.1",
+    "orchestra/testbench": "^9.4",
+    "laradumps/laradumps": "^3.2",
+    "laravel/scout": "^10.11.3",
+    "openspout/openspout": "^4.24.5"
   },
   "suggest": {
     "openspout/openspout": "Required to export XLS and CSV"
   },
-  "conflict": {
-    "laravel/framework": "10.40.0"
-  },
   "autoload": {
     "psr-4": {
       "PowerComponents\\LivewirePowerGrid\\": "src"

dist/mix-manifest.json

@@ -1,7 +1,5 @@
 {
-    "/powergrid.js": "/powergrid.js?id=e337ca9de7dd9197a219302abbb7fce0",
-    "/bootstrap5.css": "/bootstrap5.css?id=ebd9853ab6704f4a2335e83a4310bb2b",
-    "/tailwind.css": "/tailwind.css?id=714a88b9d3bc600e84388f451014ac82",
-    "/tom-select.css": "/tom-select.css?id=7af730d2c4bf937316d4002948b1571d",
-    "/powergrid.css": "/powergrid.css?id=ccf9e99db3929ffc436445d5befaf2ac"
+    "/powergrid.js": "/powergrid.js?id=9d73d8a5f9abad977a66cabf31e89f3d",
+    "/bootstrap5.css": "/bootstrap5.css?id=a27af22343149104b2aa3283d8fd502b",
+    "/tailwind.css": "/tailwind.css?id=924477e2afcb2cb56aa392e266ee56ca"
 }