From 5a12edf49d6409b421cb4ee138dab655ec4be477 Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Fri, 15 Aug 2025 15:50:18 +0300
Subject: [PATCH] Fix composer lock file

---
 app/composer.lock | 387 ----------------------------------------------
 1 file changed, 387 deletions(-)

diff --git a/app/composer.lock b/app/composer.lock
index f14b8b445..df47873c8 100644
--- a/app/composer.lock
+++ b/app/composer.lock
@@ -125,11 +125,7 @@
                 "issues": "https://github.com/cakephp/cakephp/issues",
                 "source": "https://github.com/cakephp/cakephp"
             },
-<<<<<<< HEAD
-            "time": "2025-07-27T03:26:03+00:00"
-=======
             "time": "2025-08-02T03:14:22+00:00"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
         },
         {
             "name": "cakephp/chronos",
@@ -378,18 +374,6 @@
         },
         {
             "name": "doctrine/dbal",
-<<<<<<< HEAD
-            "version": "3.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/dbal.git",
-                "reference": "1cf840d696373ea0d58ad0a8875c0fadcfc67214"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/1cf840d696373ea0d58ad0a8875c0fadcfc67214",
-                "reference": "1cf840d696373ea0d58ad0a8875c0fadcfc67214",
-=======
             "version": "3.10.1",
             "source": {
                 "type": "git",
@@ -400,7 +384,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/doctrine/dbal/zipball/3626601014388095d3af9de7e9e958623b7ef005",
                 "reference": "3626601014388095d3af9de7e9e958623b7ef005",
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
                 "shasum": ""
             },
             "require": {
@@ -485,11 +468,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-<<<<<<< HEAD
-                "source": "https://github.com/doctrine/dbal/tree/3.10.0"
-=======
                 "source": "https://github.com/doctrine/dbal/tree/3.10.1"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
             },
             "funding": [
                 {
@@ -505,11 +484,7 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
-            "time": "2025-07-10T21:11:04+00:00"
-=======
             "time": "2025-08-05T12:18:06+00:00"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
         },
         {
             "name": "doctrine/deprecations",
@@ -1806,18 +1781,6 @@
         },
         {
             "name": "symfony/config",
-<<<<<<< HEAD
-            "version": "v6.4.24",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/config.git",
-                "reference": "80e2cf005cf17138c97193be0434cdcfd1b2212e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/80e2cf005cf17138c97193be0434cdcfd1b2212e",
-                "reference": "80e2cf005cf17138c97193be0434cdcfd1b2212e",
-=======
             "version": "v7.3.2",
             "source": {
                 "type": "git",
@@ -1828,7 +1791,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/config/zipball/faef36e271bbeb74a9d733be4b56419b157762e2",
                 "reference": "faef36e271bbeb74a9d733be4b56419b157762e2",
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
                 "shasum": ""
             },
             "require": {
@@ -1874,11 +1836,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-<<<<<<< HEAD
-                "source": "https://github.com/symfony/config/tree/v6.4.24"
-=======
                 "source": "https://github.com/symfony/config/tree/v7.3.2"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
             },
             "funding": [
                 {
@@ -1898,22 +1856,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
-            "time": "2025-07-26T13:50:30+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v6.4.24",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "59266a5bf6a596e3e0844fd95e6ad7ea3c1d3350"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/59266a5bf6a596e3e0844fd95e6ad7ea3c1d3350",
-                "reference": "59266a5bf6a596e3e0844fd95e6ad7ea3c1d3350",
-=======
             "time": "2025-07-26T13:55:06+00:00"
         },
         {
@@ -1928,7 +1870,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/console/zipball/5f360ebc65c55265a74d23d7fe27f957870158a1",
                 "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1",
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
                 "shasum": ""
             },
             "require": {
@@ -1993,11 +1934,7 @@
                 "terminal"
             ],
             "support": {
-<<<<<<< HEAD
-                "source": "https://github.com/symfony/console/tree/v6.4.24"
-=======
                 "source": "https://github.com/symfony/console/tree/v7.3.2"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
             },
             "funding": [
                 {
@@ -2017,11 +1954,7 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
-            "time": "2025-07-30T10:38:54+00:00"
-=======
             "time": "2025-07-30T17:13:41+00:00"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -2836,18 +2769,6 @@
         },
         {
             "name": "cakephp/cakephp-codesniffer",
-<<<<<<< HEAD
-            "version": "4.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/cakephp/cakephp-codesniffer.git",
-                "reference": "d09f5945bec4bf82581c52eabe7cea7b92cba6e3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/cakephp-codesniffer/zipball/d09f5945bec4bf82581c52eabe7cea7b92cba6e3",
-                "reference": "d09f5945bec4bf82581c52eabe7cea7b92cba6e3",
-=======
             "version": "5.2.2",
             "source": {
                 "type": "git",
@@ -2858,7 +2779,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/cakephp/cakephp-codesniffer/zipball/3c62979556e98d0330f8af8b103ad1ade0a7067e",
                 "reference": "3c62979556e98d0330f8af8b103ad1ade0a7067e",
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
                 "shasum": ""
             },
             "require": {
@@ -2898,11 +2818,7 @@
                 "issues": "https://github.com/cakephp/cakephp-codesniffer/issues",
                 "source": "https://github.com/cakephp/cakephp-codesniffer"
             },
-<<<<<<< HEAD
-            "time": "2025-07-05T09:11:50+00:00"
-=======
             "time": "2025-06-07T17:04:07+00:00"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
         },
         {
             "name": "cakephp/debug_kit",
@@ -2971,18 +2887,6 @@
         },
         {
             "name": "cakephp/twig-view",
-<<<<<<< HEAD
-            "version": "1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/cakephp/twig-view.git",
-                "reference": "e4a18e91e004730ccbaf796bde60612e8afac0e8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/cakephp/twig-view/zipball/e4a18e91e004730ccbaf796bde60612e8afac0e8",
-                "reference": "e4a18e91e004730ccbaf796bde60612e8afac0e8",
-=======
             "version": "2.0.3",
             "source": {
                 "type": "git",
@@ -2993,18 +2897,13 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/cakephp/twig-view/zipball/b11df8e8734ae556d98b143192377dbc6a6f5360",
                 "reference": "b11df8e8734ae556d98b143192377dbc6a6f5360",
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
                 "shasum": ""
             },
             "require": {
                 "cakephp/cakephp": "^5.0.0",
                 "jasny/twig-extensions": "^1.3",
                 "twig/markdown-extra": "^3.0",
-<<<<<<< HEAD
-                "twig/twig": "^3.11.0"
-=======
                 "twig/twig": "^3.11.1"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
             },
             "conflict": {
                 "wyrihaximus/twig-view": "*"
@@ -3045,11 +2944,7 @@
                 "issues": "https://github.com/cakephp/twig-view/issues",
                 "source": "https://github.com/cakephp/twig-view"
             },
-<<<<<<< HEAD
-            "time": "2024-10-11T06:25:59+00:00"
-=======
             "time": "2024-10-11T07:53:08+00:00"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
         },
         {
             "name": "composer/class-map-generator",
@@ -3727,79 +3622,6 @@
                 "php": "^8.1"
             },
             "require-dev": {
-<<<<<<< HEAD
-                "doctrine/coding-standard": "^11",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpbench/phpbench": "^1.2",
-                "phpstan/phpstan": "^1.9.4",
-                "phpstan/phpstan-phpunit": "^1.3",
-                "phpunit/phpunit": "^9.5.27",
-                "vimeo/psalm": "^5.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "https://ocramius.github.io/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-12-30T00:23:10+00:00"
-        },
-        {
-            "name": "doctrine/sql-formatter",
-            "version": "1.5.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/sql-formatter.git",
-                "reference": "d6d00aba6fd2957fe5216fe2b7673e9985db20c8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/d6d00aba6fd2957fe5216fe2b7673e9985db20c8",
-                "reference": "d6d00aba6fd2957fe5216fe2b7673e9985db20c8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^8.1"
-            },
-            "require-dev": {
-=======
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
                 "doctrine/coding-standard": "^12",
                 "ergebnis/phpunit-slow-test-detector": "^2.14",
                 "phpstan/phpstan": "^1.10",
@@ -4232,18 +4054,6 @@
         },
         {
             "name": "nikic/php-parser",
-<<<<<<< HEAD
-            "version": "v4.19.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/715f4d25e225bc47b293a8b997fe6ce99bf987d2",
-                "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2",
-=======
             "version": "v5.6.0",
             "source": {
                 "type": "git",
@@ -4254,26 +4064,17 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/221b0d0fdf1369c71047ad1d18bb5880017bbc56",
                 "reference": "221b0d0fdf1369c71047ad1d18bb5880017bbc56",
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
                 "shasum": ""
             },
             "require": {
                 "ext-ctype": "*",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-<<<<<<< HEAD
-                "php": ">=7.1"
-            },
-            "require-dev": {
-                "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
-=======
                 "php": ">=7.4"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
                 "phpunit/phpunit": "^9.0"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
             },
             "bin": [
                 "bin/php-parse"
@@ -4305,15 +4106,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-<<<<<<< HEAD
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.4"
-            },
-            "time": "2024-09-29T15:01:53+00:00"
-=======
                 "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.0"
             },
             "time": "2025-07-27T20:03:57+00:00"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
         },
         {
             "name": "phar-io/manifest",
@@ -4482,18 +4277,6 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-<<<<<<< HEAD
-            "version": "9.2.32",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5",
-                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5",
-=======
             "version": "12.3.2",
             "source": {
                 "type": "git",
@@ -4504,28 +4287,12 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/086553c5b2e0e1e20293d782d788ab768202b621",
                 "reference": "086553c5b2e0e1e20293d782d788ab768202b621",
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-<<<<<<< HEAD
-                "nikic/php-parser": "^4.19.1 || ^5.1.0",
-                "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.6",
-                "phpunit/php-text-template": "^2.0.4",
-                "sebastian/code-unit-reverse-lookup": "^2.0.3",
-                "sebastian/complexity": "^2.0.3",
-                "sebastian/environment": "^5.1.5",
-                "sebastian/lines-of-code": "^1.0.4",
-                "sebastian/version": "^3.0.2",
-                "theseer/tokenizer": "^1.2.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.6"
-=======
                 "nikic/php-parser": "^5.4.0",
                 "php": ">=8.3",
                 "phpunit/php-file-iterator": "^6.0",
@@ -4538,7 +4305,6 @@
             },
             "require-dev": {
                 "phpunit/phpunit": "^12.1"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -4547,11 +4313,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-<<<<<<< HEAD
-                    "dev-main": "9.2.x-dev"
-=======
                     "dev-main": "12.3.x-dev"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
                 }
             },
             "autoload": {
@@ -4580,11 +4342,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-<<<<<<< HEAD
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32"
-=======
                 "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.2"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
             },
             "funding": [
                 {
@@ -4604,11 +4362,7 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
-            "time": "2024-08-22T04:23:01+00:00"
-=======
             "time": "2025-07-29T06:19:24+00:00"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -4857,22 +4611,6 @@
         },
         {
             "name": "phpunit/phpunit",
-<<<<<<< HEAD
-            "version": "9.6.23",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/43d2cb18d0675c38bd44982a5d1d88f6d53d8d95",
-                "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.5.0 || ^2",
-=======
             "version": "12.3.3",
             "source": {
                 "type": "git",
@@ -4886,39 +4624,12 @@
                 "shasum": ""
             },
             "require": {
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-<<<<<<< HEAD
-                "myclabs/deep-copy": "^1.13.1",
-                "phar-io/manifest": "^2.0.4",
-                "phar-io/version": "^3.2.1",
-                "php": ">=7.3",
-                "phpunit/php-code-coverage": "^9.2.32",
-                "phpunit/php-file-iterator": "^3.0.6",
-                "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.4",
-                "phpunit/php-timer": "^5.0.3",
-                "sebastian/cli-parser": "^1.0.2",
-                "sebastian/code-unit": "^1.0.8",
-                "sebastian/comparator": "^4.0.8",
-                "sebastian/diff": "^4.0.6",
-                "sebastian/environment": "^5.1.5",
-                "sebastian/exporter": "^4.0.6",
-                "sebastian/global-state": "^5.0.7",
-                "sebastian/object-enumerator": "^4.0.4",
-                "sebastian/resource-operations": "^3.0.4",
-                "sebastian/type": "^3.2.1",
-                "sebastian/version": "^3.0.2"
-            },
-            "suggest": {
-                "ext-soap": "To be able to generate mocks based on WSDL files",
-                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
-=======
                 "myclabs/deep-copy": "^1.13.4",
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
@@ -4938,7 +4649,6 @@
                 "sebastian/type": "^6.0.3",
                 "sebastian/version": "^6.0.0",
                 "staabm/side-effects-detector": "^1.0.5"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
             },
             "bin": [
                 "phpunit"
@@ -4978,11 +4688,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/9.6.23"
-=======
                 "source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.3"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
             },
             "funding": [
                 {
@@ -5006,22 +4712,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
-            "time": "2025-05-02T06:40:34+00:00"
-        },
-        {
-            "name": "psy/psysh",
-            "version": "v0.12.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "1b801844becfe648985372cb4b12ad6840245ace"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1b801844becfe648985372cb4b12ad6840245ace",
-                "reference": "1b801844becfe648985372cb4b12ad6840245ace",
-=======
             "time": "2025-08-11T05:34:32+00:00"
         },
         {
@@ -5036,7 +4726,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/bobthecow/psysh/zipball/6e80abe6f2257121f1eb9a4c55bf29d921025b22",
                 "reference": "6e80abe6f2257121f1eb9a4c55bf29d921025b22",
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
                 "shasum": ""
             },
             "require": {
@@ -5099,15 +4788,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-<<<<<<< HEAD
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.9"
-            },
-            "time": "2025-06-23T02:35:06+00:00"
-=======
                 "source": "https://github.com/bobthecow/psysh/tree/v0.12.10"
             },
             "time": "2025-08-04T12:39:37+00:00"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
         },
         {
             "name": "react/promise",
@@ -5906,65 +5589,7 @@
                     "type": "github"
                 }
             ],
-<<<<<<< HEAD
-            "time": "2023-02-03T06:07:39+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "3.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
-                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "support": {
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-14T16:00:52+00:00"
-=======
             "time": "2025-02-07T05:00:01+00:00"
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
         },
         {
             "name": "sebastian/type",
@@ -6412,17 +6037,6 @@
             "time": "2025-06-17T22:17:01+00:00"
         },
         {
-<<<<<<< HEAD
-            "name": "symfony/finder",
-            "version": "v7.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe"
-            },
-            "dist": {
-                "type": "zip",
-=======
             "name": "staabm/side-effects-detector",
             "version": "1.0.5",
             "source": {
@@ -6484,7 +6098,6 @@
             },
             "dist": {
                 "type": "zip",
->>>>>>> 32ede5d5 (upgrade to 5.2.6)
                 "url": "https://api.github.com/repos/symfony/finder/zipball/2a6614966ba1074fa93dae0bc804227422df4dfe",
                 "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe",
                 "shasum": ""