diff --git a/.ddev/config.yaml b/.ddev/config.yaml index 1b2b901b4c..df1cf8c173 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -1,7 +1,7 @@ name: drush type: php docroot: sut -php_version: "8.1" +php_version: "8.3" webserver_type: nginx-fpm router_http_port: "87" router_https_port: "444" @@ -21,8 +21,8 @@ webimage_extra_packages: # type: postgres # version: 14 web_environment: - - UNISH_DB_URL=mysql://root:root@db -# - "UNISH_DB_URL=sqlite://:memory:" -# - UNISH_DB_URL=pgsql://db:db@db:5432 + - UNISH_DB_URL=mysql://root:root@db/unish_dev?module=mysql +# - "UNISH_DB_URL=sqlite://:memory:?module=sqlite" +# - UNISH_DB_URL=pgsql://db:db@db:5432?module=pgsql - DRUSH_OPTIONS_URI=$DDEV_PRIMARY_URL - EDITOR=nano diff --git a/composer.json b/composer.json index e3b32fa024..50e99fd3d6 100644 --- a/composer.json +++ b/composer.json @@ -113,7 +113,7 @@ "mk:docs": "./drush --uri=dev -v mk:docs", "rector": "rector process", "sut": "./drush --uri=dev", - "sut:si": "./drush --uri=dev site:install ${INSTALL_PROFILE:-testing} --sites-subdir=dev --db-url=${UNISH_DB_URL:-mysql://root:password@mariadb}/unish_dev -v", + "sut:si": "./drush --uri=dev site:install ${INSTALL_PROFILE:-testing} --sites-subdir=dev --db-url=${UNISH_DB_URL:-mysql://root:password@mariadb/unish_dev?module=mysql} -v", "phpunit": "php -d sendmail_path='true' vendor/bin/phpunit --colors=always --testdox --configuration tests", "unit": "composer phpunit -- --testsuite unit", "integration": "composer phpunit -- --testsuite integration", diff --git a/src/Commands/core/MigrateRunnerCommands.php b/src/Commands/core/MigrateRunnerCommands.php index 2117b5fa0b..b40fbf2294 100644 --- a/src/Commands/core/MigrateRunnerCommands.php +++ b/src/Commands/core/MigrateRunnerCommands.php @@ -11,6 +11,7 @@ use Drupal\Component\Plugin\Exception\PluginException; use Drupal\Core\Datetime\DateFormatterInterface; use Drupal\Core\KeyValueStore\KeyValueFactoryInterface; +use Drupal\Core\KeyValueStore\KeyValueStoreInterface; use Drupal\migrate\Exception\RequirementsException; use Drupal\migrate\MigrateMessageInterface; use Drupal\migrate\Plugin\MigrateIdMapInterface; @@ -34,6 +35,8 @@ class MigrateRunnerCommands extends DrushCommands use AutowireTrait; protected ?MigrationPluginManagerInterface $migrationPluginManager = null; + protected KeyValueStoreInterface $keyValue; + private MigrateMessage $migrateMessage; public function __construct( protected DateFormatterInterface $dateFormatter, diff --git a/src/Commands/generate/ApplicationFactory.php b/src/Commands/generate/ApplicationFactory.php index 39fef6dc5b..fbf28722eb 100644 --- a/src/Commands/generate/ApplicationFactory.php +++ b/src/Commands/generate/ApplicationFactory.php @@ -39,7 +39,7 @@ public function create(): Application $generators = $this->discover(); $application->addCommands($generators); // Hide default Symfony console commands. - foreach (['help', 'list', 'completion', '_complete', 'generator'] as $name) { + foreach (['help', 'list', 'completion', '_complete'] as $name) { $application->get($name)->setHidden(true); } return $application; diff --git a/src/Sql/SqlBase.php b/src/Sql/SqlBase.php index 3dddc2e84b..faa3d3dfb7 100644 --- a/src/Sql/SqlBase.php +++ b/src/Sql/SqlBase.php @@ -4,17 +4,17 @@ namespace Drush\Sql; +use Consolidation\Config\Util\Interpolator; use Consolidation\SiteProcess\Util\Escape; use Drupal\Core\Database\Database; use Drush\Boot\DrupalBootLevels; +use Drush\Config\ConfigAwareTrait; use Drush\Drush; use Drush\Utils\FsUtils; -use Drush\Config\ConfigAwareTrait; use Robo\Contract\ConfigAwareInterface; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Filesystem\Path; use Symfony\Component\Process\Process; -use Consolidation\Config\Util\Interpolator; /** * The base implementation for Drush database connections. diff --git a/sut/themes/unish/drush_empty_theme/drush_empty_theme.info.yml b/sut/themes/unish/drush_empty_theme/drush_empty_theme.info.yml index 3c5a303092..db5d4608d4 100644 --- a/sut/themes/unish/drush_empty_theme/drush_empty_theme.info.yml +++ b/sut/themes/unish/drush_empty_theme/drush_empty_theme.info.yml @@ -1,6 +1,6 @@ name: Drush empty theme description: 'Drush empty theme' core: 8.x -core_version_requirement: ^8 || ^9 || ^10 +core_version_requirement: ^8 || ^9 || ^10 || ^11 type: theme base theme: stark diff --git a/tests/integration/ImageTest.php b/tests/integration/ImageTest.php index 7199fb3624..16fbde81f4 100644 --- a/tests/integration/ImageTest.php +++ b/tests/integration/ImageTest.php @@ -21,6 +21,10 @@ public function testImage() $styles_dir = $this->webroot() . '/sites/default/files/styles/'; $thumbnail = $styles_dir . 'thumbnail/public/' . $logo; $medium = $styles_dir . 'medium/public/' . $logo; + if ($this->isDrupalGreaterThanOrEqualTo('10.3.0')) { + $thumbnail .= '.webp'; + $medium .= '.webp'; + } // Remove stray files left over from previous runs @unlink($thumbnail);