Skip to content

Commit c0c6afa

Browse files
committed
test: fix tests and ensure psr-4 compatiblility
1 parent ace546c commit c0c6afa

File tree

4 files changed

+18
-25
lines changed

4 files changed

+18
-25
lines changed

.github/workflows/test.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,38 @@ jobs:
1313
test:
1414
name: Test
1515
runs-on: ubuntu-latest
16-
1716
strategy:
1817
matrix:
19-
php-version: ['8.2', '8.3', '8.4']
20-
dependency-version: ['latest', 'lowest']
21-
18+
php-version: ['8.2', '8.3']
19+
dependency-version: ['stable']
2220
steps:
2321
- name: Checkout code
2422
uses: actions/checkout@v4
2523

26-
- name: Set up PHP
24+
- name: Setup PHP
2725
uses: shivammathur/setup-php@v2
2826
with:
2927
php-version: ${{ matrix.php-version }}
3028
tools: composer
29+
coverage: none
3130

3231
- name: Get Composer Cache Directory
3332
id: composer-cache
3433
run: |
3534
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_ENV
3635
37-
- name: Cache Composer dependencies
36+
- name: Cache dependencies
3837
uses: actions/cache@v3
3938
with:
4039
path: ${{ steps.composer-cache.outputs.dir }}
41-
key: ${{ runner.os }}-composer-${{ matrix.php-version }}-${{ matrix.dependency-version }}
42-
restore-keys: ${{ runner.os }}-composer-${{ matrix.php-version }}-
40+
key: ${{ runner.os }}-php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
41+
restore-keys: |
42+
${{ runner.os }}-php-${{ matrix.php-version }}-composer-
4343
4444
- name: Install dependencies
4545
run: |
46-
if [ "${{ matrix.dependency-version }}" == "lowest" ]; then
47-
composer update --prefer-lowest --prefer-stable --no-progress --no-suggest
48-
else
49-
composer install --no-progress --no-suggest
50-
fi
46+
composer install --no-progress --no-interaction
5147
5248
- name: Run tests
53-
run: composer test
49+
run: |
50+
composer test

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@
3333
},
3434
"autoload": {
3535
"psr-4": {
36-
"GrokPHP\\": "src/"
36+
"GrokPHP\\": "src/",
37+
"GrokPHP\\Laravel\\Console\\Commands\\": "src/Laravel/Console/Commands/"
3738
}
3839
},
3940
"autoload-dev": {
4041
"psr-4": {
41-
"Tests\\": "tests/"
42+
"Tests\\": "tests/",
43+
"Tests\\Unit\\": "tests/Unit/"
4244
}
4345
},
4446
"scripts": {
@@ -47,9 +49,7 @@
4749
"phpstan": "phpstan analyse src tests",
4850
"cs-check": "phpcs",
4951
"cs-fix": "phpcbf",
50-
"post-autoload-dump": [
51-
"@php artisan package:discover --ansi"
52-
]
52+
"post-autoload-dump": []
5353
},
5454
"config": {
5555
"sort-packages": true,

src/Laravel/Commands/InstallCommand.php renamed to src/Laravel/Console/Commands/InstallCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace GrokPHP\Console;
3+
namespace GrokPHP\Laravel\Console\Commands;
44

55
use Illuminate\Console\Command;
66
use Illuminate\Support\Facades\File;

src/Laravel/GrokServiceProvider.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
use Illuminate\Support\ServiceProvider;
88
use GrokPHP\Client\GrokClient;
9-
use GrokPHP\Console\InstallCommand;
109
use GrokPHP\Enums\Model;
10+
use GrokPHP\Laravel\Console\Commands\InstallCommand;
1111

1212
class GrokServiceProvider extends ServiceProvider
1313
{
@@ -40,10 +40,6 @@ public function boot(): void
4040
$this->commands([
4141
InstallCommand::class,
4242
]);
43-
44-
$this->publishes([
45-
__DIR__.'/../../config/grok.php' => config_path('grok.php'),
46-
], 'grok');
4743
}
4844
}
4945
}

0 commit comments

Comments
 (0)