From fa93d9d1cc4b4d3a2ee9db3df84d76c57c5177a7 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Tue, 25 Jun 2024 15:31:02 +0000 Subject: [PATCH] chore: linter --- composer.lock | 156 -------------------------------------------------- 1 file changed, 156 deletions(-) diff --git a/composer.lock b/composer.lock index 22f6066aa9..5e48445d23 100644 --- a/composer.lock +++ b/composer.lock @@ -1879,10 +1879,6 @@ "source": "https://github.com/utopia-php/dsn/tree/0.2.1" }, "time": "2024-05-07T02:01:25+00:00" -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 }, { "name": "utopia-php/fetch", @@ -1922,11 +1918,6 @@ "source": "https://github.com/utopia-php/fetch/tree/0.2.1" }, "time": "2024-03-18T11:50:59+00:00" -<<<<<<< HEAD -======= ->>>>>>> 83d60612f2b93055e757913af49deab12d60c60f -======= ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 }, { "name": "utopia-php/framework", @@ -2336,10 +2327,6 @@ }, { "name": "utopia-php/platform", -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 "version": "0.7.0", "source": { "type": "git", @@ -2350,21 +2337,6 @@ "type": "zip", "url": "https://api.github.com/repos/utopia-php/platform/zipball/beeea0f2c9bce14a6869fc5c87a1047cdecb5c52", "reference": "beeea0f2c9bce14a6869fc5c87a1047cdecb5c52", -<<<<<<< HEAD -======= - "version": "0.5.2", - "source": { - "type": "git", - "url": "https://github.com/utopia-php/platform.git", - "reference": "b9feabc79b92dc2b05683a986ad43bce5c1583e3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/utopia-php/platform/zipball/b9feabc79b92dc2b05683a986ad43bce5c1583e3", - "reference": "b9feabc79b92dc2b05683a986ad43bce5c1583e3", ->>>>>>> 83d60612f2b93055e757913af49deab12d60c60f -======= ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 "shasum": "" }, "require": { @@ -2372,17 +2344,8 @@ "ext-redis": "*", "php": ">=8.0", "utopia-php/cli": "0.15.*", -<<<<<<< HEAD -<<<<<<< HEAD "utopia-php/framework": "0.33.*", "utopia-php/queue": "0.7.*" -======= - "utopia-php/framework": "0.33.*" ->>>>>>> 83d60612f2b93055e757913af49deab12d60c60f -======= - "utopia-php/framework": "0.33.*", - "utopia-php/queue": "0.7.*" ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 }, "require-dev": { "laravel/pint": "1.2.*", @@ -2408,21 +2371,9 @@ ], "support": { "issues": "https://github.com/utopia-php/platform/issues", -<<<<<<< HEAD -<<<<<<< HEAD "source": "https://github.com/utopia-php/platform/tree/0.7.0" }, "time": "2024-05-08T17:00:55+00:00" -======= - "source": "https://github.com/utopia-php/platform/tree/0.5.2" - }, - "time": "2024-05-22T12:50:35+00:00" ->>>>>>> 83d60612f2b93055e757913af49deab12d60c60f -======= - "source": "https://github.com/utopia-php/platform/tree/0.7.0" - }, - "time": "2024-05-08T17:00:55+00:00" ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 }, { "name": "utopia-php/pools", @@ -3037,8 +2988,6 @@ "packages-dev": [ { "name": "appwrite/sdk-generator", -<<<<<<< HEAD -<<<<<<< HEAD "version": "0.38.7", "source": { "type": "git", @@ -3049,26 +2998,6 @@ "type": "zip", "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/0a66c1149ef05ed9f45ce1c897c4a0ce9ee5e95a", "reference": "0a66c1149ef05ed9f45ce1c897c4a0ce9ee5e95a", -======= - "version": "0.38.6", -======= - "version": "0.38.7", ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 - "source": { - "type": "git", - "url": "https://github.com/appwrite/sdk-generator.git", - "reference": "0a66c1149ef05ed9f45ce1c897c4a0ce9ee5e95a" - }, - "dist": { - "type": "zip", -<<<<<<< HEAD - "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/d7016d6d72545e84709892faca972eb4bf5bd699", - "reference": "d7016d6d72545e84709892faca972eb4bf5bd699", ->>>>>>> 83d60612f2b93055e757913af49deab12d60c60f -======= - "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/0a66c1149ef05ed9f45ce1c897c4a0ce9ee5e95a", - "reference": "0a66c1149ef05ed9f45ce1c897c4a0ce9ee5e95a", ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 "shasum": "" }, "require": { @@ -3104,21 +3033,9 @@ "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms", "support": { "issues": "https://github.com/appwrite/sdk-generator/issues", -<<<<<<< HEAD -<<<<<<< HEAD "source": "https://github.com/appwrite/sdk-generator/tree/0.38.7" }, "time": "2024-06-10T00:23:02+00:00" -======= - "source": "https://github.com/appwrite/sdk-generator/tree/0.38.6" - }, - "time": "2024-05-20T18:00:16+00:00" ->>>>>>> 83d60612f2b93055e757913af49deab12d60c60f -======= - "source": "https://github.com/appwrite/sdk-generator/tree/0.38.7" - }, - "time": "2024-06-10T00:23:02+00:00" ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 }, { "name": "doctrine/deprecations", @@ -3239,8 +3156,6 @@ }, { "name": "laravel/pint", -<<<<<<< HEAD -<<<<<<< HEAD "version": "v1.16.1", "source": { "type": "git", @@ -3251,26 +3166,6 @@ "type": "zip", "url": "https://api.github.com/repos/laravel/pint/zipball/9266a47f1b9231b83e0cfd849009547329d871b1", "reference": "9266a47f1b9231b83e0cfd849009547329d871b1", -======= - "version": "v1.16.0", -======= - "version": "v1.16.1", ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 - "source": { - "type": "git", - "url": "https://github.com/laravel/pint.git", - "reference": "9266a47f1b9231b83e0cfd849009547329d871b1" - }, - "dist": { - "type": "zip", -<<<<<<< HEAD - "url": "https://api.github.com/repos/laravel/pint/zipball/1b3a3dc5bc6a81ff52828ba7277621f1d49d6d98", - "reference": "1b3a3dc5bc6a81ff52828ba7277621f1d49d6d98", ->>>>>>> 83d60612f2b93055e757913af49deab12d60c60f -======= - "url": "https://api.github.com/repos/laravel/pint/zipball/9266a47f1b9231b83e0cfd849009547329d871b1", - "reference": "9266a47f1b9231b83e0cfd849009547329d871b1", ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 "shasum": "" }, "require": { @@ -3281,21 +3176,9 @@ "php": "^8.1.0" }, "require-dev": { -<<<<<<< HEAD -<<<<<<< HEAD "friendsofphp/php-cs-fixer": "^3.59.3", "illuminate/view": "^10.48.12", "larastan/larastan": "^2.9.7", -======= - "friendsofphp/php-cs-fixer": "^3.57.1", - "illuminate/view": "^10.48.10", - "larastan/larastan": "^2.9.6", ->>>>>>> 83d60612f2b93055e757913af49deab12d60c60f -======= - "friendsofphp/php-cs-fixer": "^3.59.3", - "illuminate/view": "^10.48.12", - "larastan/larastan": "^2.9.7", ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 "laravel-zero/framework": "^10.4.0", "mockery/mockery": "^1.6.12", "nunomaduro/termwind": "^1.15.1", @@ -3335,15 +3218,7 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, -<<<<<<< HEAD -<<<<<<< HEAD "time": "2024-06-18T16:50:05+00:00" -======= - "time": "2024-05-21T18:08:25+00:00" ->>>>>>> 83d60612f2b93055e757913af49deab12d60c60f -======= - "time": "2024-06-18T16:50:05+00:00" ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 }, { "name": "matthiasmullie/minify", @@ -3951,10 +3826,6 @@ }, { "name": "phpstan/phpdoc-parser", -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 "version": "1.29.1", "source": { "type": "git", @@ -3965,21 +3836,6 @@ "type": "zip", "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4", "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4", -<<<<<<< HEAD -======= - "version": "1.29.0", - "source": { - "type": "git", - "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/536889f2b340489d328f5ffb7b02bb6b183ddedc", - "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc", ->>>>>>> 83d60612f2b93055e757913af49deab12d60c60f -======= ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 "shasum": "" }, "require": { @@ -4011,21 +3867,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", -<<<<<<< HEAD -<<<<<<< HEAD "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1" }, "time": "2024-05-31T08:52:43+00:00" -======= - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.0" - }, - "time": "2024-05-06T12:04:23+00:00" ->>>>>>> 83d60612f2b93055e757913af49deab12d60c60f -======= - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1" - }, - "time": "2024-05-31T08:52:43+00:00" ->>>>>>> 91fe8b7a8bccd9def26e7858dc15c049ade953a5 }, { "name": "phpunit/php-code-coverage",