Merge pull request #58 from roberto-butti/feature/upgrade-php83

Support for PHP 8.3
themsaid · Dec 6, 2024 · 6f6653f · 6f6653f
2 parents a77ce00 + ffbac5c
commit 6f6653f
Show file tree

Hide file tree

Showing 8 changed files with 834 additions and 1,602 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,24 +4,28 @@ on: [push, pull_request]
 
 jobs:
   php-cs-fixer:
-    runs-on: ubuntu-20.04
-
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: [ '8.2' ]
+    name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
     steps:
       # This is required as this package does not support PHP 8 (yet)
-      - name: Setup PHP 7.4
+      - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: ${{ matrix.php-versions }}
 
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Get Composer Cache Directory
         id: composer-cache
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Use Composer Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -32,3 +36,40 @@ jobs:
 
       - name: Execute PHP CS Fixer review
         run: composer run csfix-review
+
+  check-ibis:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: [ '8.3', '8.2','8.1', '8.0' ]
+    name: P${{ matrix.php-versions }} - L${{ matrix.laravel }} - ${{ matrix.dependency-stability }} - ${{ matrix.operating-system}}
+    steps:
+      # This is required as this package does not support PHP 8 (yet)
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Use Composer Cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+      - name: Composer Install
+        run: "composer update"
+
+      - name: test Ibis execution
+        run: |
+          mkdir export
+          ./ibis init
+          ./ibis build
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,10 @@ bin/
 vendor/
 .php_cs.cache
 .DS_Store
-/.idea
+/.idea
+
+# Files/Dirs created by ibis init
+assets/
+content/
+export/
+ibis.php
diff --git a/.php_cs b/.php_cs
diff --git a/composer.json b/composer.json
@@ -19,15 +19,15 @@
         "ibis"
     ],
     "require": {
-        "illuminate/filesystem": "^7.0|^8.0",
-        "illuminate/support": "^7.0|^8.0",
-        "symfony/console": "^4.2|^5.0",
+        "illuminate/filesystem": "^7.0|^8.0|^9.0|^10.0",
+        "illuminate/support": "^7.0|^8.0|^9.0|^10.0",
         "mpdf/mpdf": "^8.1",
-        "spatie/commonmark-highlighter": "^2.1"
+        "spatie/commonmark-highlighter": "^2.1|^3.0",
+        "symfony/console": "^4.2|^5.0|^6.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.18",
-        "symfony/var-dumper": "^5.0"
+        "laravel/pint": "^1.2",
+        "symfony/var-dumper": "^5.0|^6.0"
     },
     "autoload": {
         "psr-4": {
@@ -40,15 +40,15 @@
     },
     "scripts": {
         "csfix": [
-            "php-cs-fixer fix src stubs --config=.php_cs"
+            "pint"
         ],
         "csfix-review": [
-            "php-cs-fixer fix src stubs --config=.php_cs --dry-run -v"
+            "pint --test"
         ]
     },
     "scripts-descriptions": {
-        "csfix": "Runs PHP CS Fixer to fix project files.",
-        "csfix-review": "Runs PHP CS Fixer to show the details of which files are out of code standard."
+        "csfix": "Runs Pint to fix project files.",
+        "csfix-review": "Runs Pint to show the details of which files are out of code standard."
     },
     "minimum-stability": "dev",
     "prefer-stable": true