composer.lock

composer.lock

@@ -718,7 +718,6 @@
             "time": "2020-11-24T22:02:12+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "friendsofhyperf/openai-client",
             "version": "v3.1.48",
             "source": {
@@ -798,17 +797,6 @@
             },
             "dist": {
                 "type": "zip",
-=======
-            "name": "graham-campbell/result-type",
-            "version": "v1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945"
-            },
-            "dist": {
-                "type": "zip",
->>>>>>> 20241029_fl_order
                 "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945",
                 "reference": "3ba905c11371512af9d9bdd27d99b782216b6945",
                 "shasum": ""
@@ -1263,7 +1251,6 @@
             "time": "2024-09-25T02:54:12+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "hyperf/async-queue",
             "version": "v3.1.42",
             "source": {
@@ -1350,17 +1337,6 @@
             },
             "dist": {
                 "type": "zip",
-=======
-            "name": "hyperf/cache",
-            "version": "v3.1.43",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hyperf/cache.git",
-                "reference": "1e3cc54cee776c8d32cf40912dee5d366383bc33"
-            },
-            "dist": {
-                "type": "zip",
->>>>>>> 20241029_fl_order
                 "url": "https://api.github.com/repos/hyperf/cache/zipball/1e3cc54cee776c8d32cf40912dee5d366383bc33",
                 "reference": "1e3cc54cee776c8d32cf40912dee5d366383bc33",
                 "shasum": ""
@@ -2275,7 +2251,6 @@
         },
         {
             "name": "hyperf/coroutine",
-<<<<<<< HEAD
             "version": "v3.1.42",
             "source": {
                 "type": "git",
@@ -2286,18 +2261,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/hyperf/coroutine/zipball/1dd56202a97bce60df644ea1a8c87ea7a0888a08",
                 "reference": "1dd56202a97bce60df644ea1a8c87ea7a0888a08",
-=======
-            "version": "v3.1.49",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hyperf/coroutine.git",
-                "reference": "959ea68ac700061d8f7b76708bc52f588b66979b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/coroutine/zipball/959ea68ac700061d8f7b76708bc52f588b66979b",
-                "reference": "959ea68ac700061d8f7b76708bc52f588b66979b",
->>>>>>> 20241029_fl_order
                 "shasum": ""
             },
             "require": {
@@ -2348,7 +2311,6 @@
                     "type": "open_collective"
                 }
             ],
-<<<<<<< HEAD
             "time": "2024-09-25T02:54:12+00:00"
         },
         {
@@ -2363,22 +2325,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/hyperf/database/zipball/a53d2616486e0a77923542bb5cc363e207e5003d",
                 "reference": "a53d2616486e0a77923542bb5cc363e207e5003d",
-=======
-            "time": "2024-12-13T07:51:52+00:00"
-        },
-        {
-            "name": "hyperf/database",
-            "version": "v3.1.48",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hyperf/database.git",
-                "reference": "a16b070ee2ac2ec580a4c6f5bb6243350bed69e6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/database/zipball/a16b070ee2ac2ec580a4c6f5bb6243350bed69e6",
-                "reference": "a16b070ee2ac2ec580a4c6f5bb6243350bed69e6",
->>>>>>> 20241029_fl_order
                 "shasum": ""
             },
             "require": {
@@ -2438,11 +2384,7 @@
                     "type": "open_collective"
                 }
             ],
-<<<<<<< HEAD
             "time": "2024-11-28T01:51:55+00:00"
-=======
-            "time": "2024-12-12T01:58:16+00:00"
->>>>>>> 20241029_fl_order
         },
         {
             "name": "hyperf/db-connection",
@@ -2658,7 +2600,6 @@
         },
         {
             "name": "hyperf/engine",
-<<<<<<< HEAD
             "version": "v2.12.0",
             "source": {
                 "type": "git",
@@ -2669,18 +2610,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/hyperf/engine/zipball/f04115044ba0f483889b5849c5bc8045d3ab5b8a",
                 "reference": "f04115044ba0f483889b5849c5bc8045d3ab5b8a",
-=======
-            "version": "v2.12.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hyperf/engine.git",
-                "reference": "90be8143841482dcd00051050986251e126c6132"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/engine/zipball/90be8143841482dcd00051050986251e126c6132",
-                "reference": "90be8143841482dcd00051050986251e126c6132",
->>>>>>> 20241029_fl_order
                 "shasum": ""
             },
             "require": {
@@ -2707,12 +2636,9 @@
             },
             "type": "library",
             "extra": {
-<<<<<<< HEAD
                 "branch-alias": {
                     "dev-master": "2.12-dev"
                 },
-=======
->>>>>>> 20241029_fl_order
                 "hyperf": {
                     "config": "Hyperf\\Engine\\ConfigProvider"
                 },
@@ -2741,11 +2667,7 @@
             ],
             "support": {
                 "issues": "https://github.com/hyperf/engine/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/hyperf/engine/tree/v2.12.0"
-=======
-                "source": "https://github.com/hyperf/engine/tree/v2.12.1"
->>>>>>> 20241029_fl_order
             },
             "funding": [
                 {
@@ -2757,11 +2679,7 @@
                     "type": "open_collective"
                 }
             ],
-<<<<<<< HEAD
             "time": "2024-11-19T04:32:29+00:00"
-=======
-            "time": "2024-12-17T12:36:21+00:00"
->>>>>>> 20241029_fl_order
         },
         {
             "name": "hyperf/engine-contract",
@@ -3116,7 +3034,6 @@
         },
         {
             "name": "hyperf/http-message",
-<<<<<<< HEAD
             "version": "v3.1.47",
             "source": {
                 "type": "git",
@@ -3127,18 +3044,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/hyperf/http-message/zipball/53a7caa616ee7a196d2974348b1acbf75305bf7e",
                 "reference": "53a7caa616ee7a196d2974348b1acbf75305bf7e",
-=======
-            "version": "v3.1.48",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hyperf/http-message.git",
-                "reference": "534ce81af0feaa0c4a9e132af1c6a9c5527a8d85"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/http-message/zipball/534ce81af0feaa0c4a9e132af1c6a9c5527a8d85",
-                "reference": "534ce81af0feaa0c4a9e132af1c6a9c5527a8d85",
->>>>>>> 20241029_fl_order
                 "shasum": ""
             },
             "require": {
@@ -3180,11 +3085,7 @@
             ],
             "support": {
                 "issues": "https://github.com/hyperf/http-message/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/hyperf/http-message/tree/v3.1.47"
-=======
-                "source": "https://github.com/hyperf/http-message/tree/v3.1.48"
->>>>>>> 20241029_fl_order
             },
             "funding": [
                 {
@@ -3196,11 +3097,7 @@
                     "type": "open_collective"
                 }
             ],
-<<<<<<< HEAD
             "time": "2024-11-28T02:09:19+00:00"
-=======
-            "time": "2024-12-05T02:41:08+00:00"
->>>>>>> 20241029_fl_order
         },
         {
             "name": "hyperf/http-server",
@@ -3746,7 +3643,6 @@
             "time": "2024-09-25T02:54:12+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "hyperf/paginator",
             "version": "v3.1.42",
             "source": {
@@ -3824,17 +3720,6 @@
             },
             "dist": {
                 "type": "zip",
-=======
-            "name": "hyperf/pipeline",
-            "version": "v3.1.42",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hyperf/pipeline.git",
-                "reference": "096d9a9f87ddea33209f134d30ae8d8867a195c7"
-            },
-            "dist": {
-                "type": "zip",
->>>>>>> 20241029_fl_order
                 "url": "https://api.github.com/repos/hyperf/pipeline/zipball/096d9a9f87ddea33209f134d30ae8d8867a195c7",
                 "reference": "096d9a9f87ddea33209f134d30ae8d8867a195c7",
                 "shasum": ""
@@ -3954,7 +3839,6 @@
         },
         {
             "name": "hyperf/process",
-<<<<<<< HEAD
             "version": "v3.1.42",
             "source": {
                 "type": "git",
@@ -3965,18 +3849,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/hyperf/process/zipball/2b2286cff615989f01cb87691882b61c4c931ea3",
                 "reference": "2b2286cff615989f01cb87691882b61c4c931ea3",
-=======
-            "version": "v3.1.48",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hyperf/process.git",
-                "reference": "8d68398bdb4f2623af1bec846399b6ce29bd7d2c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/process/zipball/8d68398bdb4f2623af1bec846399b6ce29bd7d2c",
-                "reference": "8d68398bdb4f2623af1bec846399b6ce29bd7d2c",
->>>>>>> 20241029_fl_order
                 "shasum": ""
             },
             "require": {
@@ -4033,11 +3905,7 @@
                     "type": "open_collective"
                 }
             ],
-<<<<<<< HEAD
             "time": "2024-09-25T02:54:12+00:00"
-=======
-            "time": "2024-12-02T10:54:30+00:00"
->>>>>>> 20241029_fl_order
         },
         {
             "name": "hyperf/redis",
@@ -5953,7 +5821,6 @@
                 "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.4"
             },
             "time": "2024-09-29T15:01:53+00:00"
-<<<<<<< HEAD
         },
         {
             "name": "openai-php/client",
@@ -6045,8 +5912,6 @@
                 }
             ],
             "time": "2024-11-12T20:51:16+00:00"
-=======
->>>>>>> 20241029_fl_order
         },
         {
             "name": "paragonie/constant_time_encoding",
@@ -6563,7 +6428,6 @@
         },
         {
             "name": "phpseclib/phpseclib",
-<<<<<<< HEAD
             "version": "3.0.42",
             "source": {
                 "type": "git",
@@ -6574,18 +6438,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db92f1b1987b12b13f248fe76c3a52cadb67bb98",
                 "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98",
-=======
-            "version": "3.0.43",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "709ec107af3cb2f385b9617be72af8cf62441d02"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/709ec107af3cb2f385b9617be72af8cf62441d02",
-                "reference": "709ec107af3cb2f385b9617be72af8cf62441d02",
->>>>>>> 20241029_fl_order
                 "shasum": ""
             },
             "require": {
@@ -6666,11 +6518,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/phpseclib/phpseclib/tree/3.0.42"
-=======
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.43"
->>>>>>> 20241029_fl_order
             },
             "funding": [
                 {
@@ -6686,11 +6534,7 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2024-09-16T03:06:04+00:00"
-=======
-            "time": "2024-12-14T21:12:59+00:00"
->>>>>>> 20241029_fl_order
         },
         {
             "name": "psr/cache",
@@ -9163,7 +9007,6 @@
         },
         {
             "name": "hyperf/testing",
-<<<<<<< HEAD
             "version": "v3.1.46",
             "source": {
                 "type": "git",
@@ -9174,18 +9017,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/hyperf/testing/zipball/d703d287817c577acfee0cec108dc2f4217ac9fa",
                 "reference": "d703d287817c577acfee0cec108dc2f4217ac9fa",
-=======
-            "version": "v3.1.48",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hyperf/testing.git",
-                "reference": "e5e5eba5c304a876dd251e774ecdb3a8ebf97edd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/testing/zipball/e5e5eba5c304a876dd251e774ecdb3a8ebf97edd",
-                "reference": "e5e5eba5c304a876dd251e774ecdb3a8ebf97edd",
->>>>>>> 20241029_fl_order
                 "shasum": ""
             },
             "require": {
@@ -9231,11 +9062,7 @@
                 "testing"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/hyperf/testing/tree/v3.1.46"
-=======
-                "source": "https://github.com/hyperf/testing/tree/v3.1.48"
->>>>>>> 20241029_fl_order
             },
             "funding": [
                 {
@@ -9247,11 +9074,7 @@
                     "type": "open_collective"
                 }
             ],
-<<<<<<< HEAD
             "time": "2024-11-20T07:42:54+00:00"
-=======
-            "time": "2024-12-12T02:12:29+00:00"
->>>>>>> 20241029_fl_order
         },
         {
             "name": "hyperf/watcher",
@@ -9582,7 +9405,6 @@
         },
         {
             "name": "phpstan/phpstan",
-<<<<<<< HEAD
             "version": "1.12.12",
             "source": {
                 "type": "git",
@@ -9593,18 +9415,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
                 "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
-=======
-            "version": "1.12.13",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9b469068840cfa031e1deaf2fa1886d00e20680f",
-                "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f",
->>>>>>> 20241029_fl_order
                 "shasum": ""
             },
             "require": {
@@ -9649,11 +9459,7 @@
                     "type": "github"
                 }
             ],
-<<<<<<< HEAD
             "time": "2024-11-28T22:13:23+00:00"
-=======
-            "time": "2024-12-17T17:00:20+00:00"
->>>>>>> 20241029_fl_order
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -9978,7 +9784,6 @@
         },
         {
             "name": "phpunit/phpunit",
-<<<<<<< HEAD
             "version": "10.5.38",
             "source": {
                 "type": "git",
@@ -9989,18 +9794,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a86773b9e887a67bc53efa9da9ad6e3f2498c132",
                 "reference": "a86773b9e887a67bc53efa9da9ad6e3f2498c132",
-=======
-            "version": "10.5.39",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "4e89eff200b801db58f3d580ad7426431949eaa9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4e89eff200b801db58f3d580ad7426431949eaa9",
-                "reference": "4e89eff200b801db58f3d580ad7426431949eaa9",
->>>>>>> 20241029_fl_order
                 "shasum": ""
             },
             "require": {
@@ -10010,11 +9803,7 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-<<<<<<< HEAD
                 "myclabs/deep-copy": "^1.12.0",
-=======
-                "myclabs/deep-copy": "^1.12.1",
->>>>>>> 20241029_fl_order
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.1",
@@ -10076,11 +9865,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-<<<<<<< HEAD
                 "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.38"
-=======
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.39"
->>>>>>> 20241029_fl_order
             },
             "funding": [
                 {
@@ -10096,11 +9881,7 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2024-10-28T13:06:21+00:00"
-=======
-            "time": "2024-12-11T10:51:07+00:00"
->>>>>>> 20241029_fl_order
         },
         {
             "name": "react/cache",