diff --git a/app/src/HiddenFiles.php b/app/src/HiddenFiles.php index 2ee1a65..f15c082 100644 --- a/app/src/HiddenFiles.php +++ b/app/src/HiddenFiles.php @@ -3,7 +3,7 @@ namespace App; use BadMethodCallException; -use Tightenco\Collect\Support\Collection; +use Illuminate\Support\Collection; /** @extends Collection */ class HiddenFiles extends Collection diff --git a/app/src/Support/Str.php b/app/src/Support/Str.php index 1ba9cff..66c88a7 100644 --- a/app/src/Support/Str.php +++ b/app/src/Support/Str.php @@ -2,7 +2,7 @@ namespace App\Support; -use Tightenco\Collect\Support\Collection; +use Illuminate\Support\Collection; class Str { diff --git a/app/src/ViewFunctions/Breadcrumbs.php b/app/src/ViewFunctions/Breadcrumbs.php index 9f0c904..0e5dbff 100644 --- a/app/src/ViewFunctions/Breadcrumbs.php +++ b/app/src/ViewFunctions/Breadcrumbs.php @@ -4,7 +4,7 @@ namespace App\ViewFunctions; use App\Config; use App\Support\Str; -use Tightenco\Collect\Support\Collection; +use Illuminate\Support\Collection; class Breadcrumbs extends ViewFunction { diff --git a/app/src/ViewFunctions/Vite.php b/app/src/ViewFunctions/Vite.php index 2a8d28a..93d65b5 100644 --- a/app/src/ViewFunctions/Vite.php +++ b/app/src/ViewFunctions/Vite.php @@ -3,7 +3,7 @@ namespace App\ViewFunctions; use App\Config; -use Tightenco\Collect\Support\Collection; +use Illuminate\Support\Collection; use UnexpectedValueException; class Vite extends ViewFunction diff --git a/composer.json b/composer.json index 3db95a1..a19e6e3 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ "ext-fileinfo": "*", "ext-zip": "*", "filp/whoops": "^2.7", + "illuminate/collections": "^12.2", "league/commonmark": "^2.6", "maennchen/zipstream-php": "^3.1", "phlak/splat": "^6.0", @@ -31,7 +32,6 @@ "symfony/finder": "^7.0", "symfony/translation": "^7.0", "symfony/yaml": "^7.0", - "tightenco/collect": "^9.52", "vlucas/phpdotenv": "^5.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 76d5d13..498611b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "95b82022e3fea1d6ef8cc701a89dfb9d", + "content-hash": "5e2d4f83daf2ae7d3effc4b378adca86", "packages": [ { "name": "dflydev/dot-access-data", @@ -270,6 +270,202 @@ ], "time": "2024-07-20T21:45:45+00:00" }, + { + "name": "illuminate/collections", + "version": "v12.2.0", + "source": { + "type": "git", + "url": "https://github.com/illuminate/collections.git", + "reference": "8dae6a0e779b07ee17066652334d36ed473ccff2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/collections/zipball/8dae6a0e779b07ee17066652334d36ed473ccff2", + "reference": "8dae6a0e779b07ee17066652334d36ed473ccff2", + "shasum": "" + }, + "require": { + "illuminate/conditionable": "^12.0", + "illuminate/contracts": "^12.0", + "illuminate/macroable": "^12.0", + "php": "^8.2" + }, + "suggest": { + "symfony/var-dumper": "Required to use the dump method (^7.2)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "12.x-dev" + } + }, + "autoload": { + "files": [ + "functions.php", + "helpers.php" + ], + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Collections package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2025-03-12T14:22:47+00:00" + }, + { + "name": "illuminate/conditionable", + "version": "v12.2.0", + "source": { + "type": "git", + "url": "https://github.com/illuminate/conditionable.git", + "reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/conditionable/zipball/a2b3c66f3ca532e12e694bd5c9254adc303b922d", + "reference": "a2b3c66f3ca532e12e694bd5c9254adc303b922d", + "shasum": "" + }, + "require": { + "php": "^8.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "12.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Conditionable package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2025-02-19T19:08:33+00:00" + }, + { + "name": "illuminate/contracts", + "version": "v12.2.0", + "source": { + "type": "git", + "url": "https://github.com/illuminate/contracts.git", + "reference": "6b3e6b148e814077d87a56a6f89b0e3d91e06c56" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/6b3e6b148e814077d87a56a6f89b0e3d91e06c56", + "reference": "6b3e6b148e814077d87a56a6f89b0e3d91e06c56", + "shasum": "" + }, + "require": { + "php": "^8.2", + "psr/container": "^1.1.1|^2.0.1", + "psr/simple-cache": "^1.0|^2.0|^3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "12.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Contracts\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Contracts package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2025-03-05T19:37:08+00:00" + }, + { + "name": "illuminate/macroable", + "version": "v12.2.0", + "source": { + "type": "git", + "url": "https://github.com/illuminate/macroable.git", + "reference": "e862e5648ee34004fa56046b746f490dfa86c613" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/macroable/zipball/e862e5648ee34004fa56046b746f490dfa86c613", + "reference": "e862e5648ee34004fa56046b746f490dfa86c613", + "shasum": "" + }, + "require": { + "php": "^8.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "12.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Macroable package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2024-07-23T16:31:01+00:00" + }, { "name": "laravel/serializable-closure", "version": "v2.0.3", @@ -1524,6 +1720,57 @@ }, "time": "2024-09-11T13:17:53+00:00" }, + { + "name": "psr/simple-cache", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865", + "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "support": { + "source": "https://github.com/php-fig/simple-cache/tree/3.0.0" + }, + "time": "2021-10-29T13:26:27+00:00" + }, { "name": "ralouphie/getallheaders", "version": "3.0.3", @@ -2707,91 +2954,6 @@ ], "time": "2024-09-25T14:20:29+00:00" }, - { - "name": "symfony/var-dumper", - "version": "v6.4.18", - "source": { - "type": "git", - "url": "https://github.com/symfony/var-dumper.git", - "reference": "4ad10cf8b020e77ba665305bb7804389884b4837" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4ad10cf8b020e77ba665305bb7804389884b4837", - "reference": "4ad10cf8b020e77ba665305bb7804389884b4837", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "symfony/console": "<5.4" - }, - "require-dev": { - "ext-iconv": "*", - "symfony/console": "^5.4|^6.0|^7.0", - "symfony/error-handler": "^6.3|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0", - "symfony/process": "^5.4|^6.0|^7.0", - "symfony/uid": "^5.4|^6.0|^7.0", - "twig/twig": "^2.13|^3.0.4" - }, - "bin": [ - "Resources/bin/var-dump-server" - ], - "type": "library", - "autoload": { - "files": [ - "Resources/functions/dump.php" - ], - "psr-4": { - "Symfony\\Component\\VarDumper\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides mechanisms for walking through any arbitrary PHP variable", - "homepage": "https://symfony.com", - "keywords": [ - "debug", - "dump" - ], - "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.18" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2025-01-17T11:26:11+00:00" - }, { "name": "symfony/var-exporter", "version": "v7.2.4", @@ -2940,61 +3102,6 @@ ], "time": "2025-01-07T12:55:42+00:00" }, - { - "name": "tightenco/collect", - "version": "v9.52.7", - "source": { - "type": "git", - "url": "https://github.com/tighten/collect.git", - "reference": "b15143cd11fe01a700fcc449df61adc64452fa6d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tighten/collect/zipball/b15143cd11fe01a700fcc449df61adc64452fa6d", - "reference": "b15143cd11fe01a700fcc449df61adc64452fa6d", - "shasum": "" - }, - "require": { - "php": "^8.0", - "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0 || ^6.0" - }, - "require-dev": { - "mockery/mockery": "^1.0", - "nesbot/carbon": "^2.23.0", - "phpunit/phpunit": "^8.3" - }, - "type": "library", - "autoload": { - "files": [ - "src/Collect/Support/helpers.php", - "src/Collect/Support/alias.php" - ], - "psr-4": { - "Tightenco\\Collect\\": "src/Collect" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylorotwell@gmail.com" - } - ], - "description": "Collect - Illuminate Collections as a separate package.", - "keywords": [ - "collection", - "laravel" - ], - "support": { - "issues": "https://github.com/tighten/collect/issues", - "source": "https://github.com/tighten/collect/tree/v9.52.7" - }, - "abandoned": "illuminate/collections", - "time": "2023-04-14T21:51:36+00:00" - }, { "name": "twig/twig", "version": "v3.20.0", @@ -6775,6 +6882,91 @@ ], "time": "2024-11-13T13:31:26+00:00" }, + { + "name": "symfony/var-dumper", + "version": "v6.4.18", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "4ad10cf8b020e77ba665305bb7804389884b4837" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4ad10cf8b020e77ba665305bb7804389884b4837", + "reference": "4ad10cf8b020e77ba665305bb7804389884b4837", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/console": "<5.4" + }, + "require-dev": { + "ext-iconv": "*", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^6.3|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", + "twig/twig": "^2.13|^3.0.4" + }, + "bin": [ + "Resources/bin/var-dump-server" + ], + "type": "library", + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-4": { + "Symfony\\Component\\VarDumper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides mechanisms for walking through any arbitrary PHP variable", + "homepage": "https://symfony.com", + "keywords": [ + "debug", + "dump" + ], + "support": { + "source": "https://github.com/symfony/var-dumper/tree/v6.4.18" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2025-01-17T11:26:11+00:00" + }, { "name": "theseer/tokenizer", "version": "1.2.3", diff --git a/tests/HiddenFilesTest.php b/tests/HiddenFilesTest.php index 1ee8cae..f928479 100644 --- a/tests/HiddenFilesTest.php +++ b/tests/HiddenFilesTest.php @@ -7,7 +7,7 @@ use BadMethodCallException; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; -use Tightenco\Collect\Support\Collection; +use Illuminate\Support\Collection; #[CoversClass(HiddenFiles::class)] class HiddenFilesTest extends TestCase diff --git a/tests/Support/StrTest.php b/tests/Support/StrTest.php index 1c44087..990ecb7 100644 --- a/tests/Support/StrTest.php +++ b/tests/Support/StrTest.php @@ -6,7 +6,7 @@ use App\Support\Str; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Test; use Tests\TestCase; -use Tightenco\Collect\Support\Collection; +use Illuminate\Support\Collection; #[CoversClass(Str::class)] class StrTest extends TestCase diff --git a/tests/ViewFunctions/BreadcrumbsTest.php b/tests/ViewFunctions/BreadcrumbsTest.php index e4d9905..9c73e9d 100644 --- a/tests/ViewFunctions/BreadcrumbsTest.php +++ b/tests/ViewFunctions/BreadcrumbsTest.php @@ -6,7 +6,7 @@ use App\ViewFunctions\Breadcrumbs; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Test; use Tests\TestCase; -use Tightenco\Collect\Support\Collection; +use Illuminate\Support\Collection; #[CoversClass(Breadcrumbs::class)] class BreadcrumbsTest extends TestCase