diff --git a/RoboFile.php b/RoboFile.php index f31254e86..5cf8ede7f 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -3,6 +3,7 @@ require_once 'vendor/autoload.php'; use DevShop\Component\Common\GitRepository; +use Symfony\Component\Process\Process; use Symfony\Component\Yaml\Yaml; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Exception\RuntimeException; @@ -311,7 +312,7 @@ public function build($folder = 'docker', $service = 'all', $opts = [ $docker_compose_build_opts = ""; $provision_io = new \DevShop\Component\PowerProcess\PowerProcessStyle($this->input(), $this->output()); - $process = new \DevShop\Component\PowerProcess\PowerProcess("docker-compose build $docker_compose_build_opts $service", $provision_io); + $process = new Process(["docker-compose", "build", $docker_compose_build_opts, $service], $provision_io); $process->setEnv($env_build); $process->disableOutput(); $process->setTimeout(null); @@ -792,17 +793,18 @@ public function restart() { /** * Enter a bash shell in the devmaster container. */ - public function shell($user = 'aegir', $service = 'devshop.server') { - + public function shell($user = 'aegir', $service = 'docker-devshop.server-1') { if ($user) { - $process = new \Symfony\Component\Process\Process("docker-compose exec --user $user $service bash"); + $process = new Process(["docker", "exec", "-ti", "--user", $user, $service, "bash"]); } else { - $process = new \Symfony\Component\Process\Process("docker-compose exec $service bash"); + $process = new Process(["docker-compose", "exec", "-ti", $service, "bash"]); } $process->setTty(TRUE); $process->setTimeout(NULL); $process->setEnv(['COMPOSE_FILE' => './docker/docker-compose.yml']); + + $this->say("Running: " . $process->getCommandLine()); $process->run(); return $process->getExitCode(); } diff --git a/composer.json b/composer.json index e9f46da6e..ddd3381fa 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,8 @@ "php-http/httplug": "^2.3", "devshop/git-traits": "1.x-dev", "drush/drush": "^10.6", - "devshop/github-api-cli": "1.x-dev" + "devshop/github-api-cli": "1.x-dev", + "cweagans/composer-patches": "^1.7" }, "replace": { "drupal/drupal": "*" @@ -81,7 +82,8 @@ "sort-packages:": "true", "allow-plugins": { "devshop/git-split": true, - "devshop/yaml-tasks": true + "devshop/yaml-tasks": true, + "cweagans/composer-patches": true }, "platform": { "php": "7.4.0" @@ -105,6 +107,11 @@ "src/DevShop/Component/YamlTasks": "https://github.com/devshop-packages/yaml-tasks.git", "src/DevShop/Component/ControlProject": "https://github.com/devshop-packages/devshop-control-project.git" } + }, + "patches": { + "symfony/console": { + "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update_1.patch" + } } }, "minimum-stability": "dev", diff --git a/composer.lock b/composer.lock index f22e3f11b..27e73d458 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": "f8cb0da8a38644abbb3fef5db2e70257", + "content-hash": "4bcd064c3b8d05376209c418402fc120", "packages": [ { "name": "chi-teck/drupal-code-generator", @@ -126,16 +126,16 @@ }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -185,9 +185,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -203,7 +203,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "consolidation/annotated-command", @@ -831,6 +831,54 @@ "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, + { + "name": "cweagans/composer-patches", + "version": "1.7.3", + "source": { + "type": "git", + "url": "https://github.com/cweagans/composer-patches.git", + "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e190d4466fe2b103a55467dfa83fc2fecfcaf2db", + "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": ">=5.3.0" + }, + "require-dev": { + "composer/composer": "~1.0 || ~2.0", + "phpunit/phpunit": "~4.6" + }, + "type": "composer-plugin", + "extra": { + "class": "cweagans\\Composer\\Patches" + }, + "autoload": { + "psr-4": { + "cweagans\\Composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Cameron Eagans", + "email": "me@cweagans.net" + } + ], + "description": "Provides a way to patch Composer packages.", + "support": { + "issues": "https://github.com/cweagans/composer-patches/issues", + "source": "https://github.com/cweagans/composer-patches/tree/1.7.3" + }, + "time": "2022-12-20T22:53:13+00:00" + }, { "name": "devshop/bin-tools", "version": "1.x-dev", @@ -1454,26 +1502,26 @@ }, { "name": "enlightn/security-checker", - "version": "v1.10.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/enlightn/security-checker.git", - "reference": "196bacc76e7a72a63d0e1220926dbb190272db97" + "reference": "68df5c7256c84b428bf8fcff0d249de06ce362d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/enlightn/security-checker/zipball/196bacc76e7a72a63d0e1220926dbb190272db97", - "reference": "196bacc76e7a72a63d0e1220926dbb190272db97", + "url": "https://api.github.com/repos/enlightn/security-checker/zipball/68df5c7256c84b428bf8fcff0d249de06ce362d2", + "reference": "68df5c7256c84b428bf8fcff0d249de06ce362d2", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/guzzle": "^6.3|^7.0", "php": ">=5.6", - "symfony/console": "^3.4|^4|^5|^6", - "symfony/finder": "^3|^4|^5|^6", - "symfony/process": "^3.4|^4|^5|^6", - "symfony/yaml": "^3.4|^4|^5|^6" + "symfony/console": "^3.4|^4|^5|^6|^7", + "symfony/finder": "^3|^4|^5|^6|^7", + "symfony/process": "^3.4|^4|^5|^6|^7", + "symfony/yaml": "^3.4|^4|^5|^6|^7" }, "require-dev": { "ext-zip": "*", @@ -1514,9 +1562,9 @@ ], "support": { "issues": "https://github.com/enlightn/security-checker/issues", - "source": "https://github.com/enlightn/security-checker/tree/v1.10.0" + "source": "https://github.com/enlightn/security-checker/tree/v1.11.0" }, - "time": "2022-02-21T22:40:16+00:00" + "time": "2023-11-17T07:53:29+00:00" }, { "name": "grasmash/expander", @@ -1980,16 +2028,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.12", + "version": "v5.2.13", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, "require": { @@ -2044,22 +2092,22 @@ ], "support": { "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" + "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" }, - "time": "2022-04-13T08:02:27+00:00" + "time": "2023-09-26T02:20:38+00:00" }, { "name": "knplabs/github-api", - "version": "v3.11.0", + "version": "v3.13.0", "source": { "type": "git", "url": "https://github.com/KnpLabs/php-github-api.git", - "reference": "c68b874ac3267c3cc0544b726dbb4e49a72a9920" + "reference": "47024f3483520c0fafdfc5c10d2a20d87b4c7ceb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/php-github-api/zipball/c68b874ac3267c3cc0544b726dbb4e49a72a9920", - "reference": "c68b874ac3267c3cc0544b726dbb4e49a72a9920", + "url": "https://api.github.com/repos/KnpLabs/php-github-api/zipball/47024f3483520c0fafdfc5c10d2a20d87b4c7ceb", + "reference": "47024f3483520c0fafdfc5c10d2a20d87b4c7ceb", "shasum": "" }, "require": { @@ -2073,7 +2121,7 @@ "psr/cache": "^1.0|^2.0|^3.0", "psr/http-client-implementation": "^1.0", "psr/http-factory-implementation": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0|^2.0", "symfony/deprecation-contracts": "^2.2|^3.0", "symfony/polyfill-php80": "^1.17" }, @@ -2093,7 +2141,7 @@ "extra": { "branch-alias": { "dev-2.x": "2.20.x-dev", - "dev-master": "3.10.x-dev" + "dev-master": "3.12-dev" } }, "autoload": { @@ -2126,7 +2174,7 @@ ], "support": { "issues": "https://github.com/KnpLabs/php-github-api/issues", - "source": "https://github.com/KnpLabs/php-github-api/tree/v3.11.0" + "source": "https://github.com/KnpLabs/php-github-api/tree/v3.13.0" }, "funding": [ { @@ -2134,7 +2182,7 @@ "type": "github" } ], - "time": "2023-03-10T11:40:14+00:00" + "time": "2023-11-19T21:08:19+00:00" }, { "name": "league/container", @@ -2271,16 +2319,16 @@ }, { "name": "php-http/cache-plugin", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/php-http/cache-plugin.git", - "reference": "6bf9fbf66193f61d90c2381b75eb1fa0202fd314" + "reference": "b3e6c25d89ee5e4ac82115ed23b21ba87986d614" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/cache-plugin/zipball/6bf9fbf66193f61d90c2381b75eb1fa0202fd314", - "reference": "6bf9fbf66193f61d90c2381b75eb1fa0202fd314", + "url": "https://api.github.com/repos/php-http/cache-plugin/zipball/b3e6c25d89ee5e4ac82115ed23b21ba87986d614", + "reference": "b3e6c25d89ee5e4ac82115ed23b21ba87986d614", "shasum": "" }, "require": { @@ -2288,7 +2336,7 @@ "php-http/client-common": "^1.9 || ^2.0", "php-http/message-factory": "^1.0", "psr/cache": "^1.0 || ^2.0 || ^3.0", - "symfony/options-resolver": "^2.6 || ^3.0 || ^4.0 || ^5.0 || ^6.0" + "symfony/options-resolver": "^2.6 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0" @@ -2319,9 +2367,9 @@ ], "support": { "issues": "https://github.com/php-http/cache-plugin/issues", - "source": "https://github.com/php-http/cache-plugin/tree/1.8.0" + "source": "https://github.com/php-http/cache-plugin/tree/1.8.1" }, - "time": "2023-04-28T10:56:55+00:00" + "time": "2023-11-21T08:52:56+00:00" }, { "name": "php-http/client-common", @@ -2772,31 +2820,26 @@ }, { "name": "php-http/promise", - "version": "1.1.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/php-http/promise.git", - "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88" + "reference": "44a67cb59f708f826f3bec35f22030b3edb90119" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/promise/zipball/4c4c1f9b7289a2ec57cde7f1e9762a5789506f88", - "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88", + "url": "https://api.github.com/repos/php-http/promise/zipball/44a67cb59f708f826f3bec35f22030b3edb90119", + "reference": "44a67cb59f708f826f3bec35f22030b3edb90119", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "friends-of-phpspec/phpspec-code-coverage": "^4.3.2", - "phpspec/phpspec": "^5.1.2 || ^6.2" + "friends-of-phpspec/phpspec-code-coverage": "^4.3.2 || ^6.3", + "phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, "autoload": { "psr-4": { "Http\\Promise\\": "src/" @@ -2823,9 +2866,9 @@ ], "support": { "issues": "https://github.com/php-http/promise/issues", - "source": "https://github.com/php-http/promise/tree/1.1.0" + "source": "https://github.com/php-http/promise/tree/1.2.1" }, - "time": "2020-07-07T09:29:14+00:00" + "time": "2023-11-08T12:57:08+00:00" }, { "name": "psr/cache", @@ -2926,16 +2969,16 @@ }, { "name": "psr/http-client", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { @@ -2972,9 +3015,9 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/1.0.2" + "source": "https://github.com/php-fig/http-client" }, - "time": "2023-04-10T20:12:12+00:00" + "time": "2023-09-23T14:17:50+00:00" }, { "name": "psr/http-factory", @@ -3496,16 +3539,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.13", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e" + "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e", - "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/761c8b8387cfe5f8026594a75fdf0a4e83ba6974", + "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974", "shasum": "" }, "require": { @@ -3555,7 +3598,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.13" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.10.0" }, "funding": [ { @@ -3571,7 +3614,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/filesystem", @@ -4487,16 +4530,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.28", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73" + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73", - "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6172e4ae3534d25ee9e07eb487c20be7760fcc65", + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65", "shasum": "" }, "require": { @@ -4556,7 +4599,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.28" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.29" }, "funding": [ { @@ -4572,7 +4615,7 @@ "type": "tidelift" } ], - "time": "2023-08-24T13:38:36+00:00" + "time": "2023-09-12T10:09:58+00:00" }, { "name": "symfony/yaml", @@ -4707,16 +4750,16 @@ }, { "name": "twig/twig", - "version": "v2.15.5", + "version": "v2.15.6", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "fc02a6af3eeb97c4bf5650debc76c2eda85ac22e" + "reference": "ad637405a828601a56f32ccab9a85541c4b66c9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/fc02a6af3eeb97c4bf5650debc76c2eda85ac22e", - "reference": "fc02a6af3eeb97c4bf5650debc76c2eda85ac22e", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ad637405a828601a56f32ccab9a85541c4b66c9d", + "reference": "ad637405a828601a56f32ccab9a85541c4b66c9d", "shasum": "" }, "require": { @@ -4727,7 +4770,7 @@ }, "require-dev": { "psr/container": "^1.0", - "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" + "symfony/phpunit-bridge": "^5.4.9|^6.3" }, "type": "library", "extra": { @@ -4771,7 +4814,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.15.5" + "source": "https://github.com/twigphp/Twig/tree/v2.15.6" }, "funding": [ { @@ -4783,7 +4826,7 @@ "type": "tidelift" } ], - "time": "2023-05-03T17:49:41+00:00" + "time": "2023-11-21T17:34:48+00:00" }, { "name": "webflo/drupal-finder", @@ -4960,5 +5003,5 @@ "platform-overrides": { "php": "7.4.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/src/DevShop/Control/composer.json b/src/DevShop/Control/composer.json index 18cf7595c..d322aba7e 100644 --- a/src/DevShop/Control/composer.json +++ b/src/DevShop/Control/composer.json @@ -137,7 +137,7 @@ "drupal/core-composer-scaffold": true }, "platform": { - "php": "7.4.0" + "php": "8.1" } }, "autoload": { @@ -193,7 +193,15 @@ "preserve-paths": [ "web/sites", "web/profiles/devmaster" - ] + ], + "patches": { + "drush/drush": { + "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-11-28/drush-8-symfony-console-compat.patch" + }, + "symfony/console": { + "https://www.drupal.org/project/provision/issues/3353492#comment-15336648": "https://www.drupal.org/files/issues/2023-12-11/3353492-symfony-console-4-update_1.patch" + } + } }, "minimum-stability": "dev", "prefer-stable": true diff --git a/src/DevShop/Control/composer.lock b/src/DevShop/Control/composer.lock index 6ecbcfa98..6864f06c6 100644 --- a/src/DevShop/Control/composer.lock +++ b/src/DevShop/Control/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": "52d6347611a0b7958d52465082235adf", + "content-hash": "f6080f579ba845c2e9550fc1c181764e", "packages": [ { "name": "behat/behat", @@ -161,26 +161,28 @@ }, { "name": "behat/mink", - "version": "v1.10.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/minkphp/Mink.git", - "reference": "19e58905632e7cfdc5b2bafb9b950a3521af32c5" + "reference": "d8527fdf8785aad38455fb426af457ab9937aece" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/Mink/zipball/19e58905632e7cfdc5b2bafb9b950a3521af32c5", - "reference": "19e58905632e7cfdc5b2bafb9b950a3521af32c5", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/d8527fdf8785aad38455fb426af457ab9937aece", + "reference": "d8527fdf8785aad38455fb426af457ab9937aece", "shasum": "" }, "require": { "php": ">=7.2", - "symfony/css-selector": "^4.4 || ^5.0 || ^6.0" + "symfony/css-selector": "^4.4 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-phpunit": "^1.3", "phpunit/phpunit": "^8.5.22 || ^9.5.11", - "symfony/error-handler": "^4.4 || ^5.0 || ^6.0", - "symfony/phpunit-bridge": "^5.4 || ^6.0" + "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0" }, "suggest": { "behat/mink-browserkit-driver": "fast headless driver for any app without JS emulation", @@ -219,9 +221,9 @@ ], "support": { "issues": "https://github.com/minkphp/Mink/issues", - "source": "https://github.com/minkphp/Mink/tree/v1.10.0" + "source": "https://github.com/minkphp/Mink/tree/v1.11.0" }, - "time": "2022-03-28T14:22:43+00:00" + "time": "2023-12-09T11:23:23+00:00" }, { "name": "behat/mink-browserkit-driver", @@ -347,28 +349,30 @@ }, { "name": "behat/mink-selenium2-driver", - "version": "v1.6.0", + "version": "v1.7.0", "source": { "type": "git", "url": "https://github.com/minkphp/MinkSelenium2Driver.git", - "reference": "e5f8421654930da725499fb92983e6948c6f973e" + "reference": "4ca4083f305de7dff4434ac402dc4e3f39c0866a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/e5f8421654930da725499fb92983e6948c6f973e", - "reference": "e5f8421654930da725499fb92983e6948c6f973e", + "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/4ca4083f305de7dff4434ac402dc4e3f39c0866a", + "reference": "4ca4083f305de7dff4434ac402dc4e3f39c0866a", "shasum": "" }, "require": { - "behat/mink": "^1.9@dev", + "behat/mink": "^1.11@dev", "ext-json": "*", - "instaclick/php-webdriver": "^1.4", + "instaclick/php-webdriver": "^1.4.14", "php": ">=7.2" }, "require-dev": { "mink/driver-testsuite": "dev-master", + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-phpunit": "^1.3", "phpunit/phpunit": "^8.5.22 || ^9.5.11", - "symfony/error-handler": "^4.4 || ^5.0" + "symfony/error-handler": "^4.4 || ^5.0 || ^6.0 || ^7.0" }, "type": "mink-driver", "extra": { @@ -409,9 +413,9 @@ ], "support": { "issues": "https://github.com/minkphp/MinkSelenium2Driver/issues", - "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.6.0" + "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.7.0" }, - "time": "2022-03-28T14:55:17+00:00" + "time": "2023-12-09T11:58:45+00:00" }, { "name": "behat/transliterator", @@ -464,21 +468,21 @@ }, { "name": "bitbucket/client", - "version": "v4.1.0", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/BitbucketPHP/Client.git", - "reference": "c8a6e24ec71e987dde37207d4bd0810989c7a8b8" + "reference": "88e0b6f1d4a85297a193e444616f04534b65ed78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BitbucketPHP/Client/zipball/c8a6e24ec71e987dde37207d4bd0810989c7a8b8", - "reference": "c8a6e24ec71e987dde37207d4bd0810989c7a8b8", + "url": "https://api.github.com/repos/BitbucketPHP/Client/zipball/88e0b6f1d4a85297a193e444616f04534b65ed78", + "reference": "88e0b6f1d4a85297a193e444616f04534b65ed78", "shasum": "" }, "require": { "ext-json": "*", - "php": "^7.2.5 || ^8.0", + "php": "^7.4.15 || ^8.0.2", "php-http/cache-plugin": "^1.7.5", "php-http/client-common": "^2.5", "php-http/discovery": "^1.14", @@ -525,7 +529,7 @@ ], "support": { "issues": "https://github.com/BitbucketPHP/Client/issues", - "source": "https://github.com/BitbucketPHP/Client/tree/v4.1.0" + "source": "https://github.com/BitbucketPHP/Client/tree/v4.2.0" }, "funding": [ { @@ -537,27 +541,27 @@ "type": "tidelift" } ], - "time": "2022-01-23T19:14:04+00:00" + "time": "2022-01-24T02:53:45+00:00" }, { "name": "clue/stream-filter", - "version": "v1.6.0", + "version": "v1.7.0", "source": { "type": "git", "url": "https://github.com/clue/stream-filter.git", - "reference": "d6169430c7731d8509da7aecd0af756a5747b78e" + "reference": "049509fef80032cb3f051595029ab75b49a3c2f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/clue/stream-filter/zipball/d6169430c7731d8509da7aecd0af756a5747b78e", - "reference": "d6169430c7731d8509da7aecd0af756a5747b78e", + "url": "https://api.github.com/repos/clue/stream-filter/zipball/049509fef80032cb3f051595029ab75b49a3c2f7", + "reference": "049509fef80032cb3f051595029ab75b49a3c2f7", "shasum": "" }, "require": { "php": ">=5.3" }, "require-dev": { - "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36" + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" }, "type": "library", "autoload": { @@ -579,7 +583,7 @@ } ], "description": "A simple and modern approach to stream filtering in PHP", - "homepage": "https://github.com/clue/php-stream-filter", + "homepage": "https://github.com/clue/stream-filter", "keywords": [ "bucket brigade", "callback", @@ -591,7 +595,7 @@ ], "support": { "issues": "https://github.com/clue/stream-filter/issues", - "source": "https://github.com/clue/stream-filter/tree/v1.6.0" + "source": "https://github.com/clue/stream-filter/tree/v1.7.0" }, "funding": [ { @@ -603,7 +607,7 @@ "type": "github" } ], - "time": "2022-02-21T13:15:14+00:00" + "time": "2023-12-20T15:40:13+00:00" }, { "name": "composer/installers", @@ -1920,16 +1924,16 @@ }, { "name": "drupal/core-composer-scaffold", - "version": "10.1.5", + "version": "10.2.0", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "1ccd7db5ff8a5425b5bbba9b9a05e366363c0a51" + "reference": "97bd91856535a354e9b1b815f0957893e26b6622" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/1ccd7db5ff8a5425b5bbba9b9a05e366363c0a51", - "reference": "1ccd7db5ff8a5425b5bbba9b9a05e366363c0a51", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/97bd91856535a354e9b1b815f0957893e26b6622", + "reference": "97bd91856535a354e9b1b815f0957893e26b6622", "shasum": "" }, "require": { @@ -1964,26 +1968,27 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.1.5" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.2.0" }, - "time": "2023-04-30T16:15:32+00:00" + "time": "2023-11-15T23:23:28+00:00" }, { "name": "drupal/core-utility", - "version": "9.5.11", + "version": "10.2.0", "source": { "type": "git", "url": "https://github.com/drupal/core-utility.git", - "reference": "9793955d939577a2bb1f61f479cf453c0ba15938" + "reference": "7b385a85ef56ce47831609b9f0d600216c8e4990" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-utility/zipball/9793955d939577a2bb1f61f479cf453c0ba15938", - "reference": "9793955d939577a2bb1f61f479cf453c0ba15938", + "url": "https://api.github.com/repos/drupal/core-utility/zipball/7b385a85ef56ce47831609b9f0d600216c8e4990", + "reference": "7b385a85ef56ce47831609b9f0d600216c8e4990", "shasum": "" }, "require": { - "php": ">=7.3.0" + "masterminds/html5": "^2.7", + "php": ">=8.1.0" }, "type": "library", "extra": { @@ -2006,9 +2011,9 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-utility/tree/9.5.11" + "source": "https://github.com/drupal/core-utility/tree/10.2.0" }, - "time": "2023-05-02T08:15:56+00:00" + "time": "2023-12-03T22:09:22+00:00" }, { "name": "drupal/ctools", @@ -2202,23 +2207,23 @@ }, { "name": "drupal/drupal", - "version": "7.98.0", + "version": "7.99.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/drupal.git", - "reference": "7.98" + "reference": "7.99" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/drupal-7.98.zip", - "reference": "7.98", - "shasum": "388ab378e346997f6739f74daf2bf1fafea1e851" + "url": "https://ftp.drupal.org/files/projects/drupal-7.99.zip", + "reference": "7.99", + "shasum": "3c0e44967c1bc00eb26600d3d3d1980ed95c705f" }, "type": "drupal-core", "extra": { "drupal": { - "version": "7.98", - "datestamp": "1686154390", + "version": "7.99", + "datestamp": "1701873806", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2650,10 +2655,6 @@ { "name": "mpotter", "homepage": "https://www.drupal.org/user/616192" - }, - { - "name": "nedjo", - "homepage": "https://www.drupal.org/user/4481" } ], "description": "Provides feature management for Drupal.", @@ -3517,7 +3518,7 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/provision.git", - "reference": "9bcb40458f5d28a3ee4d6f8e487e46a01cacf7f9" + "reference": "f867e8f8526950fbc825456088d1ad6159b8ffd3" }, "require": { "devshop/git-traits": "1.x-dev", @@ -3536,8 +3537,8 @@ "dev-4.x": "4.x-dev" }, "drupal": { - "version": "7.x-4.0-beta19+6-dev", - "datestamp": "1701108199", + "version": "7.x-4.0-beta19+18-dev", + "datestamp": "1703108993", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -4416,69 +4417,6 @@ "abandoned": "symfony/browser-kit", "time": "2020-11-01T09:30:18+00:00" }, - { - "name": "facebook/graph-sdk", - "version": "5.7.0", - "source": { - "type": "git", - "url": "https://github.com/facebook/php-graph-sdk.git", - "reference": "2d8250638b33d73e7a87add65f47fabf91f8ad9b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/facebook/php-graph-sdk/zipball/2d8250638b33d73e7a87add65f47fabf91f8ad9b", - "reference": "2d8250638b33d73e7a87add65f47fabf91f8ad9b", - "shasum": "" - }, - "require": { - "php": "^5.4|^7.0" - }, - "require-dev": { - "guzzlehttp/guzzle": "~5.0", - "mockery/mockery": "~0.8", - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "guzzlehttp/guzzle": "Allows for implementation of the Guzzle HTTP client", - "paragonie/random_compat": "Provides a better CSPRNG option in PHP 5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } - }, - "autoload": { - "files": [ - "src/Facebook/polyfills.php" - ], - "psr-4": { - "Facebook\\": "src/Facebook/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Facebook Platform" - ], - "authors": [ - { - "name": "Facebook", - "homepage": "https://github.com/facebook/php-graph-sdk/contributors" - } - ], - "description": "Facebook SDK for PHP", - "homepage": "https://github.com/facebook/php-graph-sdk", - "keywords": [ - "facebook", - "sdk" - ], - "support": { - "issues": "https://github.com/facebook/php-graph-sdk/issues", - "source": "https://github.com/facebook/php-graph-sdk/tree/5.7.0" - }, - "abandoned": true, - "time": "2018-12-11T22:56:31+00:00" - }, { "name": "friends-of-behat/mink-extension", "version": "v2.7.4", @@ -4978,27 +4916,22 @@ }, { "name": "hybridauth/hybridauth", - "version": "v2.18.0", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/hybridauth/hybridauth.git", - "reference": "a879408ad340b68c79faeea2e7a85b95a1f261ba" + "reference": "d4e5bc34008e8c187c302eb4e94200ee4a208c63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hybridauth/hybridauth/zipball/a879408ad340b68c79faeea2e7a85b95a1f261ba", - "reference": "a879408ad340b68c79faeea2e7a85b95a1f261ba", + "url": "https://api.github.com/repos/hybridauth/hybridauth/zipball/d4e5bc34008e8c187c302eb4e94200ee4a208c63", + "reference": "d4e5bc34008e8c187c302eb4e94200ee4a208c63", "shasum": "" }, "require": { "ext-curl": "*", - "facebook/graph-sdk": "^5.4", - "paypal/rest-api-sdk-php": "*", "php": ">=5.2.0" }, - "require-dev": { - "squizlabs/php_codesniffer": "2.*" - }, "type": "library", "autoload": { "psr-0": { @@ -5036,22 +4969,22 @@ "forum": "https://groups.google.com/d/forum/hybridauth", "gitter": "https://gitter.im/hybridauth/hybridauth", "issues": "https://github.com/hybridauth/hybridauth/issues", - "source": "https://github.com/hybridauth/hybridauth/tree/v2.18.0" + "source": "https://github.com/hybridauth/hybridauth/tree/master" }, - "time": "2021-03-08T13:17:31+00:00" + "time": "2016-09-05T03:02:22+00:00" }, { "name": "instaclick/php-webdriver", - "version": "1.4.16", + "version": "1.4.18", "source": { "type": "git", "url": "https://github.com/instaclick/php-webdriver.git", - "reference": "a39a1f6dc0f4ddd8b2438fa5eb1f67755730d606" + "reference": "a61a8459f86c79dd1f19934ea3929804f2e41f8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/a39a1f6dc0f4ddd8b2438fa5eb1f67755730d606", - "reference": "a39a1f6dc0f4ddd8b2438fa5eb1f67755730d606", + "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/a61a8459f86c79dd1f19934ea3929804f2e41f8c", + "reference": "a61a8459f86c79dd1f19934ea3929804f2e41f8c", "shasum": "" }, "require": { @@ -5099,9 +5032,9 @@ ], "support": { "issues": "https://github.com/instaclick/php-webdriver/issues", - "source": "https://github.com/instaclick/php-webdriver/tree/1.4.16" + "source": "https://github.com/instaclick/php-webdriver/tree/1.4.18" }, - "time": "2022-10-28T13:30:35+00:00" + "time": "2023-12-08T07:11:19+00:00" }, { "name": "justinrainbow/json-schema", @@ -5175,16 +5108,16 @@ }, { "name": "knplabs/github-api", - "version": "v3.12.0", + "version": "v3.13.0", "source": { "type": "git", "url": "https://github.com/KnpLabs/php-github-api.git", - "reference": "b50fc1f40bb5ac50957d32c5732fcde9167ac30a" + "reference": "47024f3483520c0fafdfc5c10d2a20d87b4c7ceb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/php-github-api/zipball/b50fc1f40bb5ac50957d32c5732fcde9167ac30a", - "reference": "b50fc1f40bb5ac50957d32c5732fcde9167ac30a", + "url": "https://api.github.com/repos/KnpLabs/php-github-api/zipball/47024f3483520c0fafdfc5c10d2a20d87b4c7ceb", + "reference": "47024f3483520c0fafdfc5c10d2a20d87b4c7ceb", "shasum": "" }, "require": { @@ -5218,7 +5151,7 @@ "extra": { "branch-alias": { "dev-2.x": "2.20.x-dev", - "dev-master": "3.11.x-dev" + "dev-master": "3.12-dev" } }, "autoload": { @@ -5251,7 +5184,7 @@ ], "support": { "issues": "https://github.com/KnpLabs/php-github-api/issues", - "source": "https://github.com/KnpLabs/php-github-api/tree/v3.12.0" + "source": "https://github.com/KnpLabs/php-github-api/tree/v3.13.0" }, "funding": [ { @@ -5259,20 +5192,87 @@ "type": "github" } ], - "time": "2023-09-30T16:42:04+00:00" + "time": "2023-11-19T21:08:19+00:00" + }, + { + "name": "masterminds/html5", + "version": "2.8.1", + "source": { + "type": "git", + "url": "https://github.com/Masterminds/html5-php.git", + "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f47dcf3c70c584de14f21143c55d9939631bc6cf", + "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Masterminds\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matt Butcher", + "email": "technosophos@gmail.com" + }, + { + "name": "Matt Farina", + "email": "matt@mattfarina.com" + }, + { + "name": "Asmir Mustafic", + "email": "goetas@gmail.com" + } + ], + "description": "An HTML5 parser and serializer.", + "homepage": "http://masterminds.github.io/html5-php", + "keywords": [ + "HTML5", + "dom", + "html", + "parser", + "querypath", + "serializer", + "xml" + ], + "support": { + "issues": "https://github.com/Masterminds/html5-php/issues", + "source": "https://github.com/Masterminds/html5-php/tree/2.8.1" + }, + "time": "2023-05-10T11:58:31+00:00" }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -5313,9 +5313,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "npm-asset/ansi-regex", @@ -5358,10 +5358,10 @@ }, { "name": "npm-asset/backbone", - "version": "1.4.1", + "version": "1.5.0", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/backbone/-/backbone-1.4.1.tgz" + "url": "https://registry.npmjs.org/backbone/-/backbone-1.5.0.tgz" }, "require": { "npm-asset/underscore": ">=1.8.3" @@ -5978,60 +5978,6 @@ }, "time": "2021-12-15T12:32:42+00:00" }, - { - "name": "paypal/rest-api-sdk-php", - "version": "1.14.0", - "source": { - "type": "git", - "url": "https://github.com/paypal/PayPal-PHP-SDK.git", - "reference": "72e2f2466975bf128a31e02b15110180f059fc04" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paypal/PayPal-PHP-SDK/zipball/72e2f2466975bf128a31e02b15110180f059fc04", - "reference": "72e2f2466975bf128a31e02b15110180f059fc04", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "ext-json": "*", - "php": ">=5.3.0", - "psr/log": "^1.0.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35" - }, - "type": "library", - "autoload": { - "psr-0": { - "PayPal": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "PayPal", - "homepage": "https://github.com/paypal/rest-api-sdk-php/contributors" - } - ], - "description": "PayPal's PHP SDK for REST APIs", - "homepage": "http://paypal.github.io/PayPal-PHP-SDK/", - "keywords": [ - "payments", - "paypal", - "rest", - "sdk" - ], - "support": { - "issues": "https://github.com/paypal/PayPal-PHP-SDK/issues", - "source": "https://github.com/paypal/PayPal-PHP-SDK/tree/master" - }, - "abandoned": true, - "time": "2019-01-04T20:04:25+00:00" - }, { "name": "pear/console_table", "version": "v1.3.1", @@ -6093,16 +6039,16 @@ }, { "name": "php-http/cache-plugin", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/php-http/cache-plugin.git", - "reference": "6bf9fbf66193f61d90c2381b75eb1fa0202fd314" + "reference": "b3e6c25d89ee5e4ac82115ed23b21ba87986d614" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/cache-plugin/zipball/6bf9fbf66193f61d90c2381b75eb1fa0202fd314", - "reference": "6bf9fbf66193f61d90c2381b75eb1fa0202fd314", + "url": "https://api.github.com/repos/php-http/cache-plugin/zipball/b3e6c25d89ee5e4ac82115ed23b21ba87986d614", + "reference": "b3e6c25d89ee5e4ac82115ed23b21ba87986d614", "shasum": "" }, "require": { @@ -6110,7 +6056,7 @@ "php-http/client-common": "^1.9 || ^2.0", "php-http/message-factory": "^1.0", "psr/cache": "^1.0 || ^2.0 || ^3.0", - "symfony/options-resolver": "^2.6 || ^3.0 || ^4.0 || ^5.0 || ^6.0" + "symfony/options-resolver": "^2.6 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0" @@ -6141,22 +6087,22 @@ ], "support": { "issues": "https://github.com/php-http/cache-plugin/issues", - "source": "https://github.com/php-http/cache-plugin/tree/1.8.0" + "source": "https://github.com/php-http/cache-plugin/tree/1.8.1" }, - "time": "2023-04-28T10:56:55+00:00" + "time": "2023-11-21T08:52:56+00:00" }, { "name": "php-http/client-common", - "version": "2.7.0", + "version": "2.7.1", "source": { "type": "git", "url": "https://github.com/php-http/client-common.git", - "reference": "880509727a447474d2a71b7d7fa5d268ddd3db4b" + "reference": "1e19c059b0e4d5f717bf5d524d616165aeab0612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/880509727a447474d2a71b7d7fa5d268ddd3db4b", - "reference": "880509727a447474d2a71b7d7fa5d268ddd3db4b", + "url": "https://api.github.com/repos/php-http/client-common/zipball/1e19c059b0e4d5f717bf5d524d616165aeab0612", + "reference": "1e19c059b0e4d5f717bf5d524d616165aeab0612", "shasum": "" }, "require": { @@ -6166,7 +6112,7 @@ "psr/http-client": "^1.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.0 || ^2.0", - "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", + "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0 || ^7.0", "symfony/polyfill-php80": "^1.17" }, "require-dev": { @@ -6210,9 +6156,9 @@ ], "support": { "issues": "https://github.com/php-http/client-common/issues", - "source": "https://github.com/php-http/client-common/tree/2.7.0" + "source": "https://github.com/php-http/client-common/tree/2.7.1" }, - "time": "2023-05-17T06:46:59+00:00" + "time": "2023-11-30T10:31:25+00:00" }, { "name": "php-http/discovery", @@ -6593,16 +6539,16 @@ }, { "name": "php-http/promise", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/php-http/promise.git", - "reference": "ef4905bfb492ff389eb7f12e26925a0f20073050" + "reference": "44a67cb59f708f826f3bec35f22030b3edb90119" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/promise/zipball/ef4905bfb492ff389eb7f12e26925a0f20073050", - "reference": "ef4905bfb492ff389eb7f12e26925a0f20073050", + "url": "https://api.github.com/repos/php-http/promise/zipball/44a67cb59f708f826f3bec35f22030b3edb90119", + "reference": "44a67cb59f708f826f3bec35f22030b3edb90119", "shasum": "" }, "require": { @@ -6639,9 +6585,9 @@ ], "support": { "issues": "https://github.com/php-http/promise/issues", - "source": "https://github.com/php-http/promise/tree/1.2.0" + "source": "https://github.com/php-http/promise/tree/1.2.1" }, - "time": "2023-10-24T09:20:26+00:00" + "time": "2023-11-08T12:57:08+00:00" }, { "name": "psr/cache", @@ -6952,25 +6898,25 @@ }, { "name": "psy/psysh", - "version": "v0.11.22", + "version": "v0.12.0", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b" + "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b", - "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/750bf031a48fd07c673dbe3f11f72362ea306d0d", + "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d", "shasum": "" }, "require": { "ext-json": "*", "ext-tokenizer": "*", - "nikic/php-parser": "^4.0 || ^3.1", - "php": "^8.0 || ^7.0.8", - "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4", - "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4" + "nikic/php-parser": "^5.0 || ^4.0", + "php": "^8.0 || ^7.4", + "symfony/console": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4", + "symfony/var-dumper": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4" }, "conflict": { "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" @@ -6981,8 +6927,7 @@ "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", "ext-pdo-sqlite": "The doc command requires SQLite to work.", - "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history." + "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well." }, "bin": [ "bin/psysh" @@ -6990,7 +6935,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-0.11": "0.11.x-dev" + "dev-main": "0.12.x-dev" }, "bamarni-bin": { "bin-links": false, @@ -7026,9 +6971,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.22" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.0" }, - "time": "2023-10-14T21:56:36+00:00" + "time": "2023-12-20T15:28:09+00:00" }, { "name": "pyrech/composer-changelogs", @@ -7804,16 +7749,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.13", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e" + "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e", - "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/761c8b8387cfe5f8026594a75fdf0a4e83ba6974", + "reference": "761c8b8387cfe5f8026594a75fdf0a4e83ba6974", "shasum": "" }, "require": { @@ -7863,7 +7808,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.13" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.10.0" }, "funding": [ { @@ -7879,7 +7824,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/filesystem", @@ -9532,7 +9477,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.4.0" + "php": "8.1" }, "plugin-api-version": "2.2.0" } diff --git a/src/DevShop/Control/symfony-console-4-update.patch b/src/DevShop/Control/symfony-console-4-update.patch new file mode 100644 index 000000000..cef864723 --- /dev/null +++ b/src/DevShop/Control/symfony-console-4-update.patch @@ -0,0 +1,279 @@ +diff --git a/Input/InputInterface.php b/Input/InputInterface.php +index 8efc6232..a723a5ae 100644 +--- a/Input/InputInterface.php ++++ b/Input/InputInterface.php +@@ -18,146 +18,133 @@ use Symfony\Component\Console\Exception\RuntimeException; + * InputInterface is the interface implemented by all input classes. + * + * @author Fabien Potencier ++ * ++ * @method string __toString() Returns a stringified representation of the args passed to the command. ++ * InputArguments MUST be escaped as well as the InputOption values passed to the command. + */ + interface InputInterface + { +- /** +- * Returns the first argument from the raw parameters (not parsed). +- * +- * @return string|null The value of the first argument or null otherwise +- */ +- public function getFirstArgument(); +- +- /** +- * Returns true if the raw parameters (not parsed) contain a value. +- * +- * This method is to be used to introspect the input parameters +- * before they have been validated. It must be used carefully. +- * Does not necessarily return the correct result for short options +- * when multiple flags are combined in the same option. +- * +- * @param string|array $values The values to look for in the raw parameters (can be an array) +- * @param bool $onlyParams Only check real parameters, skip those following an end of options (--) signal +- * +- * @return bool true if the value is contained in the raw parameters +- */ +- public function hasParameterOption($values, $onlyParams = false); +- +- /** +- * Returns the value of a raw option (not parsed). +- * +- * This method is to be used to introspect the input parameters +- * before they have been validated. It must be used carefully. +- * Does not necessarily return the correct result for short options +- * when multiple flags are combined in the same option. +- * +- * @param string|array $values The value(s) to look for in the raw parameters (can be an array) +- * @param string|bool|int|float|array|null $default The default value to return if no result is found +- * @param bool $onlyParams Only check real parameters, skip those following an end of options (--) signal +- * +- * @return mixed The option value +- */ +- public function getParameterOption($values, $default = false, $onlyParams = false); +- +- /** +- * Binds the current Input instance with the given arguments and options. +- * +- * @throws RuntimeException +- */ +- public function bind(InputDefinition $definition); +- +- /** +- * Validates the input. +- * +- * @throws RuntimeException When not enough arguments are given +- */ +- public function validate(); +- +- /** +- * Returns all the given arguments merged with the default values. +- * +- * @return array +- */ +- public function getArguments(); +- +- /** +- * Returns the argument value for a given argument name. +- * +- * @param string $name The argument name +- * +- * @return mixed +- * +- * @throws InvalidArgumentException When argument given doesn't exist +- */ +- public function getArgument($name); +- +- /** +- * Sets an argument value by name. +- * +- * @param string $name The argument name +- * @param mixed $value The argument value +- * +- * @throws InvalidArgumentException When argument given doesn't exist +- */ +- public function setArgument($name, $value); +- +- /** +- * Returns true if an InputArgument object exists by name or position. +- * +- * @param string $name The argument name +- * +- * @return bool true if the InputArgument object exists, false otherwise +- */ +- public function hasArgument($name); +- +- /** +- * Returns all the given options merged with the default values. +- * +- * @return array +- */ +- public function getOptions(); +- +- /** +- * Returns the option value for a given option name. +- * +- * @param string $name The option name +- * +- * @return mixed +- * +- * @throws InvalidArgumentException When option given doesn't exist +- */ +- public function getOption($name); +- +- /** +- * Sets an option value by name. +- * +- * @param string $name The option name +- * @param mixed $value The option value +- * +- * @throws InvalidArgumentException When option given doesn't exist +- */ +- public function setOption($name, $value); +- +- /** +- * Returns true if an InputOption object exists by name. +- * +- * @param string $name The InputOption name +- * +- * @return bool true if the InputOption object exists, false otherwise +- */ +- public function hasOption($name); +- +- /** +- * Is this input means interactive? +- * +- * @return bool +- */ +- public function isInteractive(); +- +- /** +- * Sets the input interactivity. +- * +- * @param bool $interactive If the input should be interactive +- */ +- public function setInteractive($interactive); +-} ++ /** ++ * Returns the first argument from the raw parameters (not parsed). ++ */ ++ public function getFirstArgument(): ?string; ++ ++ /** ++ * Returns true if the raw parameters (not parsed) contain a value. ++ * ++ * This method is to be used to introspect the input parameters ++ * before they have been validated. It must be used carefully. ++ * Does not necessarily return the correct result for short options ++ * when multiple flags are combined in the same option. ++ * ++ * @param string|array $values The values to look for in the raw parameters (can be an array) ++ * @param bool $onlyParams Only check real parameters, skip those following an end of options (--) signal ++ */ ++ public function hasParameterOption(string|array $values, bool $onlyParams = false): bool; ++ ++ /** ++ * Returns the value of a raw option (not parsed). ++ * ++ * This method is to be used to introspect the input parameters ++ * before they have been validated. It must be used carefully. ++ * Does not necessarily return the correct result for short options ++ * when multiple flags are combined in the same option. ++ * ++ * @param string|array $values The value(s) to look for in the raw parameters (can be an array) ++ * @param string|bool|int|float|array|null $default The default value to return if no result is found ++ * @param bool $onlyParams Only check real parameters, skip those following an end of options (--) signal ++ * ++ * @return mixed ++ */ ++ public function getParameterOption(string|array $values, string|bool|int|float|array|null $default = false, bool $onlyParams = false); ++ ++ /** ++ * Binds the current Input instance with the given arguments and options. ++ * ++ * @return void ++ * ++ * @throws RuntimeException ++ */ ++ public function bind(InputDefinition $definition); ++ ++ /** ++ * Validates the input. ++ * ++ * @return void ++ * ++ * @throws RuntimeException When not enough arguments are given ++ */ ++ public function validate(); ++ ++ /** ++ * Returns all the given arguments merged with the default values. ++ * ++ * @return array ++ */ ++ public function getArguments(): array; ++ ++ /** ++ * Returns the argument value for a given argument name. ++ * ++ * @return mixed ++ * ++ * @throws InvalidArgumentException When argument given doesn't exist ++ */ ++ public function getArgument(string $name); ++ ++ /** ++ * Sets an argument value by name. ++ * ++ * @return void ++ * ++ * @throws InvalidArgumentException When argument given doesn't exist ++ */ ++ public function setArgument(string $name, mixed $value); ++ ++ /** ++ * Returns true if an InputArgument object exists by name or position. ++ */ ++ public function hasArgument(string $name): bool; ++ ++ /** ++ * Returns all the given options merged with the default values. ++ * ++ * @return array ++ */ ++ public function getOptions(): array; ++ ++ /** ++ * Returns the option value for a given option name. ++ * ++ * @return mixed ++ * ++ * @throws InvalidArgumentException When option given doesn't exist ++ */ ++ public function getOption(string $name); ++ ++ /** ++ * Sets an option value by name. ++ * ++ * @return void ++ * ++ * @throws InvalidArgumentException When option given doesn't exist ++ */ ++ public function setOption(string $name, mixed $value); ++ ++ /** ++ * Returns true if an InputOption object exists by name. ++ */ ++ public function hasOption(string $name): bool; ++ ++ /** ++ * Is this input means interactive? ++ */ ++ public function isInteractive(): bool; ++ ++ /** ++ * Sets the input interactivity. ++ * ++ * @return void ++ */ ++ public function setInteractive(bool $interactive); ++} +\ No newline at end of file diff --git a/src/DevShop/Control/tests/features/project.create.feature b/src/DevShop/Control/tests/features/project.create.feature index 985e1ca27..7ded3564a 100644 --- a/src/DevShop/Control/tests/features/project.create.feature +++ b/src/DevShop/Control/tests/features/project.create.feature @@ -45,10 +45,14 @@ Feature: Create a project and check settings # drushdrush branch has drush 11. And I select "drushdrush" from "project[environments][NEW][git_ref]" - And I press "Add environment" + And I fill in "live" for "project[environments][NEW][name]" And I select "9.x" from "project[environments][NEW][git_ref]" + And I press "Add environment" + + And I fill in "dev" for "project[environments][NEW][name]" + And I select "10.x" from "project[environments][NEW][git_ref]" And I press "Add environment" diff --git a/vars.development.yml b/vars.development.yml index 8a4d652bd..3dd59ee93 100644 --- a/vars.development.yml +++ b/vars.development.yml @@ -6,7 +6,7 @@ devshop_cli_skip_update: true devmaster_skip_upgrade: true # The default for local development. -php_version: "8.1" +php_version: "8.0" xdebug_enabled: true php_xdebug_remote_enable: true