8.x

amethyst-php · Mar 28, 2024 · d02f66d · d02f66d
1 parent 2ac3794
commit d02f66d
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 139 deletions.
diff --git a/.env.example b/.env.example
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php
         with:
-          php-version: 7.2
+          php-version: 8.3
           extension-csv: mbstring, dom, fileinfo, mysql, zip
           coverage: xdebug #optional
       - name: Get composer cache directory
@@ -24,8 +24,9 @@ jobs:
       - name: Install Composer dependencies
         run: |
             composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
-            composer global require amethyst/cli
+            composer require --dev phpstan/phpstan
       - name: Test Quality
         run: |
-            export PATH="$HOME/.composer/vendor/bin:$PATH"
-            amethyst test:phpstan --verbose
+          export PATH="$HOME/.composer/vendor/bin:$PATH"
+          ./vendor/bin/phpstan analyse --level=0 src
+          ./vendor/bin/phpstan analyse --level=0 tests
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -11,22 +11,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-
+        uses: actions/checkout@v4
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php
+        with:
+          php-version: 8.3
+          extension-csv: mbstring, dom, fileinfo, mysql, zip
+          coverage: xdebug #optional
       - name: Install Composer dependencies
         run: |
           composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
-          composer global require amethyst/cli
+          composer require --dev friendsofphp/php-cs-fixer
 
       - name: Run fix:style
         run: |
           export PATH="$HOME/.composer/vendor/bin:$PATH"
-          amethyst fix:style --verbose
+          ./vendor/bin/php-cs-fixer fix src
+          ./vendor/bin/php-cs-fixer fix tests
 
       - uses: stefanzweifel/git-auto-commit-action@v2.1.0
         with:
           commit_message: Apply style changes
           branch: ${{ github.ref }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,22 +2,21 @@ name: Test
 on: 
   pull_request:
     paths:
-      - '**.php'      
+      - '**.php' 
+      - '**.yml'
   push:
     paths:
       - '**.php'
+      - '**.yml'
 jobs:
   laravel:
-    name: Laravel ${{ matrix.laravel-versions }} (PHP ${{ matrix.php-versions }})
+    name: Laravel ${{ matrix.laravel }} (PHP ${{ matrix.php }})
     runs-on: ubuntu-latest
     env:
       DB_DATABASE: laravel
       DB_USERNAME: root
       DB_PASSWORD: password
-      BROADCAST_DRIVER: log
-      CACHE_DRIVER: redis
-      QUEUE_CONNECTION: redis
-      SESSION_DRIVER: redis    
+      BROADCAST_DRIVER: log 
     services:
       mysql:
         image: mysql:5.7
@@ -36,29 +35,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.2', '7.3', '7.4']
-        laravel-versions: ['5.8.*', '6.*']
+        php: ['8.2', '8.3']
+        laravel: ['9.*', '10.*']
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: ${{ matrix.php }}
           extension-csv: mbstring, dom, fileinfo, mysql, zip
           coverage: xdebug #optional
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Install Composer dependencies
         run: |
-            composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
-            composer require --dev amethyst/cli
-            composer require --dev "laravel/framework:${{ matrix.laravel-versions }}" --no-update;
+          composer require --dev "laravel/framework:${{ matrix.laravel }}" --no-update
+          composer update --no-progress --no-suggest --prefer-dist --optimize-autoloader
       - name: Prepare the application
         run: |
           php -r "file_exists('.env') || copy('.env.example', '.env');"
       - name: Test
-        run: vendor/bin/amethyst test:phpunit --verbose
+        run: ./vendor/bin/phpunit --coverage-text --coverage-clover=build/logs/clover.xml
         env:
           DB_PORT: ${{ job.services.mysql.ports['3306'] }}
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,9 @@
 vendor/
-var/
 \.php_cs\.cache
+build/
 \.env
 composer\.lock
-build/
-phpunit\.xml
+.phpunit.result.cache
+phpunit.xml
+.php-cs-fixer.cache
+.phpunit.cache/test-results
diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -4,14 +4,13 @@
     "keywords": ["laravel", "amethyst", "amethyst-setting", "setting"],
     "license": "MIT",
     "require": {
-        "php": ">=7.2",
-        "amethyst/core": "0.2.*",
-        "amethyst/user": "0.2.*"
+        "php": ">=8.2",
+        "amethyst/core": "0.3.*",
+        "amethyst/user": "0.3.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "*",
         "orchestra/testbench": "*",
-        "amethyst/authentication": "0.2.*"
+        "amethyst/authentication": "0.3.*"
     },
     "autoload": {
         "psr-4" : {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
     <testsuites>
         <testsuite name="Application Test Suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+    <source>
+        <include>
+          <directory suffix=".php">./src</directory>
+        </include>
+    </source>
     <php>
         <env name="APP_ENV" value="testing"/>
     </php>