From 12df495f582afc17b3ace176cd5ebc8574600785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=96zisik?= Date: Thu, 21 Mar 2024 18:20:00 +0200 Subject: [PATCH 1/9] update deps --- .github/workflows/test.yml | 16 ++++++++++++---- composer.json | 6 +++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e1f4219..3bb6c69 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,12 +8,14 @@ jobs: strategy: fail-fast: true matrix: - php: [7.4, 8.0, 8.1, 8.2] - laravel: [8.*, 9.*, 10.*] + php: [7.4, 8.0, 8.1, 8.2, 8.3] + laravel: [8.*, 9.*, 10.*, 11.*] statamic: [3.*, 4.*] - exclude: + exclude: - laravel: 8.* php: 8.2 + - laravel: 8.* + php: 8.3 - laravel: 9.* php: 7.4 - laravel: 8.* @@ -24,6 +26,12 @@ jobs: php: 7.4 - laravel: 10.* php: 8.0 + - laravel: 11.* + php: 7.4 + - laravel: 11.* + php: 8.0 + - laravel: 11.* + statamic: 3.* dependency-version: [prefer-stable] name: P${{ matrix.php }} - L${{ matrix.laravel }} - S${{ matrix.statamic }} @@ -47,4 +55,4 @@ jobs: run: composer require laravel/framework:${{ matrix.laravel }} statamic/cms:${{ matrix.statamic }} --prefer-dist --no-interaction --no-suggest - name: Execute tests - run: vendor/bin/phpunit \ No newline at end of file + run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index 63eb344..0289b7d 100644 --- a/composer.json +++ b/composer.json @@ -14,14 +14,14 @@ ], "require": { "php": "^7.4|^8.0", - "laravel/framework": "^7.30.3 || ^8.24 || ^9.0 || ^10.0", + "laravel/framework": "^7.30.3|^8.24|^9.0|^10.0|^11.0", "statamic/cms": "^3.0.0|^4.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.8", - "nunomaduro/collision": "^4.1 || ^5.0 || ^6.0", + "nunomaduro/collision": "^4.1|^5.0|^6.0", "orchestra/testbench": "^5.0|^6.0|^7.0|^8.0", - "phpunit/phpunit": "^9.5" + "phpunit/phpunit": "^9.5|^10.0" }, "autoload": { "psr-4": { From 3ac6b3f24c3361814814bcae4165a11c0ffcbfa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=96zisik?= Date: Thu, 21 Mar 2024 18:22:07 +0200 Subject: [PATCH 2/9] update matrix --- .github/workflows/test.yml | 6 +++++- composer.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3bb6c69..ced6f41 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: matrix: php: [7.4, 8.0, 8.1, 8.2, 8.3] laravel: [8.*, 9.*, 10.*, 11.*] - statamic: [3.*, 4.*] + statamic: [3.*, 4.*, 5.*] exclude: - laravel: 8.* php: 8.2 @@ -20,6 +20,8 @@ jobs: php: 7.4 - laravel: 8.* statamic: 4.* + - laravel: 8.* + statamic: 5.* - laravel: 10.* statamic: 3.* - laravel: 10.* @@ -32,6 +34,8 @@ jobs: php: 8.0 - laravel: 11.* statamic: 3.* + - laravel: 11.* + statamic: 4.* dependency-version: [prefer-stable] name: P${{ matrix.php }} - L${{ matrix.laravel }} - S${{ matrix.statamic }} diff --git a/composer.json b/composer.json index 0289b7d..aa8a7a4 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "require": { "php": "^7.4|^8.0", "laravel/framework": "^7.30.3|^8.24|^9.0|^10.0|^11.0", - "statamic/cms": "^3.0.0|^4.0" + "statamic/cms": "^3.0.0|^4.0|^5.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.8", From 287bbcaf066e8f9be3efccbecf923140f00782c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=96zisik?= Date: Thu, 21 Mar 2024 18:22:30 +0200 Subject: [PATCH 3/9] update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index aa8a7a4..978b092 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^3.8", "nunomaduro/collision": "^4.1|^5.0|^6.0", - "orchestra/testbench": "^5.0|^6.0|^7.0|^8.0", + "orchestra/testbench": "^5.0|^6.0|^7.0|^8.0|^9.0", "phpunit/phpunit": "^9.5|^10.0" }, "autoload": { From 8dac93b36f44bacc788c39782c0110bbe38454c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=96zisik?= Date: Fri, 10 May 2024 17:55:14 +0300 Subject: [PATCH 4/9] update --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ced6f41..88b4e7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,4 @@ name: run-tests - on: [push] jobs: From bda519d5bb8881432062e2d02272174d9f639eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=96zisik?= Date: Fri, 10 May 2024 17:57:02 +0300 Subject: [PATCH 5/9] exclude Statamic 5 w/ L9 --- .github/workflows/test.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 88b4e7f..cb018f3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,11 +15,13 @@ jobs: php: 8.2 - laravel: 8.* php: 8.3 - - laravel: 9.* - php: 7.4 - laravel: 8.* - statamic: 4.* + statamic: 5.* - laravel: 8.* + statamic: 4.* + - laravel: 9.* + php: 7.4 + - laravel: 9.* statamic: 5.* - laravel: 10.* statamic: 3.* From a2603421f548653b016f7b8756f3e6a0822da4fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=96zisik?= Date: Fri, 10 May 2024 17:59:12 +0300 Subject: [PATCH 6/9] update nunomaduro/collision --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 978b092..e3f1faa 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.8", - "nunomaduro/collision": "^4.1|^5.0|^6.0", + "nunomaduro/collision": "^4.1|^5.0|^6.0|^8.1", "orchestra/testbench": "^5.0|^6.0|^7.0|^8.0|^9.0", "phpunit/phpunit": "^9.5|^10.0" }, From 6f75689db11c81d90c74b74daedd7fa279bba1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=96zisik?= Date: Fri, 10 May 2024 19:17:26 +0300 Subject: [PATCH 7/9] exclude laravel 11 and php8.1 --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cb018f3..e2eb987 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,6 +33,8 @@ jobs: php: 7.4 - laravel: 11.* php: 8.0 + - laravel: 11.* + php: 8.1 - laravel: 11.* statamic: 3.* - laravel: 11.* From b932d0b18f49e5e99ec6ee1b62cc4cf401c7b61f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=96zisik?= Date: Fri, 10 May 2024 19:20:41 +0300 Subject: [PATCH 8/9] support v5 --- tests/TestCase.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/TestCase.php b/tests/TestCase.php index 043641d..59f49cb 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -100,9 +100,16 @@ protected function resolveApplicationConfiguration($app) ]; foreach ($configs as $config) { + + $path = __DIR__ . "/../vendor/statamic/cms/config/{$config}.php"; + + if (!file_exists($path)) { + continue; + } + $app['config']->set( "statamic.$config", - require(__DIR__ . "/../vendor/statamic/cms/config/{$config}.php") + require($path) ); } @@ -111,7 +118,7 @@ protected function resolveApplicationConfiguration($app) protected function initializeDirectory($directory) { - if (! file_exists($directory)) { + if (!file_exists($directory)) { mkdir($directory); } } From 1fc053ba34b23004ff347900761209a41d333340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=96zisik?= Date: Fri, 10 May 2024 19:22:31 +0300 Subject: [PATCH 9/9] update laravel --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 35fa9c7..81388fd 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,9 @@ [![Latest Version on Packagist](https://img.shields.io/packagist/v/swiftmade/statamic-clear-assets.svg?style=for-the-badge)](https://packagist.org/packages/swiftmade/statamic-clear-assets) ![Downloads](https://img.shields.io/packagist/dt/swiftmade/statamic-clear-assets?style=for-the-badge) + +> Supports Statamic 3, 4 and 5. + Clean up unused images and assets from your Statamic site. Saves storage, keep things tidy. The addon scans your entire `content` and `users` directory. If an asset is not referenced anywhere, it will be marked as unused. You can review the list of unused assets and delete them.