Merge pull request #1 from stackkit/develop

Cleanup package

Author: marickvantuil

.github/workflows/run-tests.yml

@@ -11,19 +11,18 @@ jobs:
 
     strategy:
       matrix:
-        db: ['mysql', 'pgsql']
         payload:
-          - { queue: 'github-actions-laravel9-php81', laravel: '9.*', php: '8.1', 'testbench': '7.*'}
-          - { queue: 'github-actions-laravel9-php80', laravel: '9.*', php: '8.0', 'testbench': '7.*'}
-          - { queue: 'github-actions-laravel8-php81', laravel: '8.*', php: '8.1', 'testbench': '6.*'}
-          - { queue: 'github-actions-laravel8-php80', laravel: '8.*', php: '8.0', 'testbench': '6.*'}
-          - { queue: 'github-actions-laravel8-php74', laravel: '8.*', php: '7.4', 'testbench': '6.*'}
-          - { queue: 'github-actions-laravel7-php80', laravel: '7.*', php: '8.0', 'testbench': '5.*' }
-          - { queue: 'github-actions-laravel7-php74', laravel: '7.*', php: '7.4', 'testbench': '5.*' }
-          - { queue: 'github-actions-laravel6-php80', laravel: '6.*', php: '8.0', 'testbench': '4.*' }
-          - { queue: 'github-actions-laravel6-php74', laravel: '6.*', php: '7.4', 'testbench': '4.*' }
+          - { laravel: '9.*', php: '8.1', 'testbench': '7.*'}
+          - { laravel: '9.*', php: '8.0', 'testbench': '7.*'}
+          - { laravel: '8.*', php: '8.1', 'testbench': '6.*'}
+          - { laravel: '8.*', php: '8.0', 'testbench': '6.*'}
+          - { laravel: '8.*', php: '7.4', 'testbench': '6.*'}
+          - { laravel: '7.*', php: '8.0', 'testbench': '5.*' }
+          - { laravel: '7.*', php: '7.4', 'testbench': '5.*' }
+          - { laravel: '6.*', php: '8.0', 'testbench': '4.*' }
+          - { laravel: '6.*', php: '7.4', 'testbench': '4.*' }
 
-    name: PHP ${{ matrix.payload.php }} - Laravel ${{ matrix.payload.laravel }} - DB ${{ matrix.db }}
+    name: PHP ${{ matrix.payload.php }} - Laravel ${{ matrix.payload.laravel }}
 
     steps:
       - name: Checkout code
@@ -36,30 +35,8 @@ jobs:
           extensions: mbstring, dom, fileinfo
           coverage: none
 
-      - name: Set up MySQL and PostgreSQL
-        run: |
-          MYSQL_PORT=3307 POSTGRES_PORT=5432 docker compose up ${{ matrix.db }} -d
-      - name: Install dependencies
+      - name: Execute checks
         run: |
           composer require "laravel/framework:${{ matrix.payload.laravel }}" "orchestra/testbench:${{ matrix.payload.testbench }}" --no-interaction --no-update
           composer update --prefer-stable --prefer-dist --no-interaction --no-suggest
-          if [ "${{ matrix.db }}" = "mysql" ]; then
-            while ! mysqladmin ping --host=127.0.0.1 --user=cloudtasks --port=3307 --password=cloudtasks --silent; do
-              echo "Waiting for MySQL..."
-              sleep 1
-            done
-          else
-            echo "Not waiting for MySQL."
-          fi
-      - name: Execute tests
-        env:
-          DB_DRIVER: ${{ matrix.db }}
-          CI_CLOUD_TASKS_PROJECT_ID: ${{ secrets.CI_CLOUD_TASKS_PROJECT_ID }}
-          CI_CLOUD_TASKS_QUEUE: ${{ secrets.CI_CLOUD_TASKS_QUEUE }}
-          CI_CLOUD_TASKS_LOCATION: ${{ secrets.CI_CLOUD_TASKS_LOCATION }}
-          CI_CLOUD_TASKS_SERVICE_ACCOUNT_EMAIL: ${{ secrets.CI_CLOUD_TASKS_SERVICE_ACCOUNT_EMAIL }}
-          CI_SERVICE_ACCOUNT_JSON_KEY: ${{ secrets.CI_SERVICE_ACCOUNT_JSON_KEY }}
-          CI_CLOUD_TASKS_CUSTOM_QUEUE: ${{ matrix.payload.queue }}
-        run: |
-          echo $CI_SERVICE_ACCOUNT_JSON_KEY > tests/Support/gcloud-key-valid.json
-          vendor/bin/phpunit
+          vendor/bin/phpstan

assets/cloud-tasks-home.png

@@ -10,15 +10,20 @@
     "require": {
         "google/cloud-logging": "^1.10"
     },
+    "require-dev": {
+        "phpstan/phpstan": "^1.8",
+        "nunomaduro/larastan": "^1.0 || ^2.0",
+        "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "thecodingmachine/phpstan-safe-rule": "^1.2"
+    },
     "autoload": {
         "psr-4": {
             "Stackkit\\LaravelGoogleCloudLogging\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests/",
-            "Factories\\": "factories/"
+            "Tests\\": "tests/"
         }
     },
     "extra": {

assets/dashboard.png

@@ -6,5 +6,3 @@ parameters:
         - src
     level: 9
     checkMissingIterableValueType: false
-    ignoreErrors:
-        - '/Cannot call method when\(\) on mixed/'

assets/logo.png

@@ -10,10 +10,6 @@
          stopOnFailure="false">
     <testsuites>
         <testsuite name="Testsuite">
-            <file>./tests/ConfigTest.php</file>
-            <file>./tests/TaskHandlerTest.php</file>
-            <file>./tests/CloudTasksApiTest.php</file>
-            <file>./tests/CloudTasksDashboardTest.php</file>
         </testsuite>
     </testsuites>
     <php>
@@ -23,8 +19,5 @@
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="MAIL_DRIVER" value="log"/>
-        <env name="GOOGLE_APPLICATION_CREDENTIALS" value="./tests/Support/gcloud-key-valid.json" />
-        <env name="QUEUE_DRIVER" value="cloudtasks"/>
-        <env name="DB_DRIVER" value="mysql" />
     </php>
 </phpunit>

composer.json

@@ -6,19 +6,11 @@ class TestCase extends \Orchestra\Testbench\TestCase
 {
     protected function getPackageProviders($app)
     {
-        return [
-            \Stackkit\LaravelGoogleCloudLogging\LoggingServiceProvider::class,
-        ];
-    }
-
-    protected function defineDatabaseMigrations()
-    {
-        $this->loadMigrationsFrom(__DIR__ . '/../migrations');
-        $this->loadMigrationsFrom(__DIR__ . '/../vendor/orchestra/testbench-core/laravel/migrations');
+        return [];
     }
 
     protected function getEnvironmentSetUp($app)
     {
-//        $app['config']->set('cloud-tasks.dashboard.enabled', false);
+        //
     }
 }