From d1c9ec204007d3ee433bc33e10fe80015b20969c Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Thu, 4 Nov 2021 15:47:45 +0530 Subject: [PATCH 01/14] Updating dependencies in favor of Drupal 9 compatiblity 1. Added "drupal/core-dev" for enabling PHPUnit tests. See: https://www.drupal.org/docs/develop/using-composer/starting-a-site-using-drupal-composer-project-templates#s-adding-drupalcore-dev 2. Updated "drupal/drupal-extension" to "^4.1". And removed other behat dependencies as they will be installed with drupal-extension. 3. Update "phpunit/phpunit" to "^9.1". See: https://www.drupal.org/project/drupal/issues/3127141 4. Removed symfony/css-selector as it will installed as dependency of symfony/http-kernel --- composer.json | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 0eef64c70..c1e1bef26 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,6 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "roave/security-advisories": "dev-master", "drush/drush": "10.*@stable", "goalgorilla/open_social": "dev-main", "goalgorilla/open_social_scripts": "^2.0", @@ -14,25 +13,20 @@ "blackfire/php-sdk": "^1.19" }, "require-dev": { + "drupal/core-dev": "^9.2", + "drupal/coder": "8.3.11", + "dealerdirect/phpcodesniffer-composer-installer": "~0.6 || ~0.7", + "drupal/drupal-extension": "^4.1", "jcalderonzumba/gastonjs": "~1.0.2", "jcalderonzumba/mink-phantomjs-driver": "~0.3.1", "mikey179/vfsstream": "~1.2", - "symfony/css-selector": "~2.8", - "behat/behat": "3.*@stable", - "behat/mink": "1.*@stable", - "behat/mink-extension": "*", - "behat/mink-goutte-driver": "*", - "behat/mink-selenium2-driver": "*", - "drupal/coder": "8.3.11", - "dealerdirect/phpcodesniffer-composer-installer": "~0.6 || ~0.7", - "drupal/drupal-extension": "^3.4", + "mglaman/drupal-check": "^1.0", + "palantirnet/drupal-rector": "^0.5.6", "phpmd/phpmd": "@stable", - "phpunit/phpunit": "^7.5", - "drupal/console": "@stable", - "zaporylie/composer-drupal-optimizations": "^1.0", + "phpspec/prophecy-phpunit": "^2", + "phpunit/phpunit": "^9.1", "squizlabs/html_codesniffer": "*", - "mglaman/drupal-check": "^1.0", - "palantirnet/drupal-rector": "^0.5.6" + "zaporylie/composer-drupal-optimizations": "^1.0" }, "autoload": { "psr-4": { From f75074aebaefe8bb2f944dcbe12ab7a472aa509f Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Fri, 12 Nov 2021 09:54:00 +0530 Subject: [PATCH 02/14] Updated dependencies for Drupal 9. --- composer.json | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index c1e1bef26..f7661e1fc 100644 --- a/composer.json +++ b/composer.json @@ -5,28 +5,36 @@ "license": "GPL-2.0-or-later", "minimum-stability": "dev", "prefer-stable": true, + "config": { + "optimize-autoloader": true, + "update-with-dependencies": true, + "sort-packages": true + }, "require": { "drush/drush": "10.*@stable", - "goalgorilla/open_social": "dev-main", + "goalgorilla/open_social": "dev-feature/3162491-group-update-d9-coding-standard", "goalgorilla/open_social_scripts": "^2.0", - "drupal/redis": "^1.2", - "blackfire/php-sdk": "^1.19" + "drupal/redis": "^1.5", + "blackfire/php-sdk": "^v1.27.1" }, "require-dev": { - "drupal/core-dev": "^9.2", - "drupal/coder": "8.3.11", - "dealerdirect/phpcodesniffer-composer-installer": "~0.6 || ~0.7", + "dealerdirect/phpcodesniffer-composer-installer": "~0.7.1", + "drupal/coder": "8.3.13", + "drupal/composer_deploy": "^1.6", + "drupal/core-dev": "~9.1.0", + "drupal/devel": "4.1.1", "drupal/drupal-extension": "^4.1", - "jcalderonzumba/gastonjs": "~1.0.2", - "jcalderonzumba/mink-phantomjs-driver": "~0.3.1", - "mikey179/vfsstream": "~1.2", - "mglaman/drupal-check": "^1.0", - "palantirnet/drupal-rector": "^0.5.6", - "phpmd/phpmd": "@stable", + "drupal/upgrade_status": "^3.11", + "jcalderonzumba/gastonjs": "~1.2.0", + "jcalderonzumba/mink-phantomjs-driver": "~0.3.3", + "mglaman/drupal-check": "^1.0.0", + "mikey179/vfsstream": "~1.6.0", + "palantirnet/drupal-rector": "^0.11.4", "phpspec/prophecy-phpunit": "^2", - "phpunit/phpunit": "^9.1", + "phpstan/extension-installer": "^1.1", + "slevomat/coding-standard": "^7.0", "squizlabs/html_codesniffer": "*", - "zaporylie/composer-drupal-optimizations": "^1.0" + "symplify/easy-coding-standard": "^9.4" }, "autoload": { "psr-4": { From b6438bca9295a6ac7048c058e122ebb9df7ae648 Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Fri, 12 Nov 2021 09:58:38 +0530 Subject: [PATCH 03/14] Changed Open Social's branch to copy. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f7661e1fc..e2415d7dd 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ }, "require": { "drush/drush": "10.*@stable", - "goalgorilla/open_social": "dev-feature/3162491-group-update-d9-coding-standard", + "goalgorilla/open_social": "dev-feature/3162491-group-update-d9", "goalgorilla/open_social_scripts": "^2.0", "drupal/redis": "^1.5", "blackfire/php-sdk": "^v1.27.1" From 01b561f80422ebfa43ebe1e423ff3d00599bed69 Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Fri, 12 Nov 2021 18:25:34 +0530 Subject: [PATCH 04/14] Added ecs.php and rector.php file. --- composer.json | 18 +++++++++++------ ecs.php | 32 ++++++++++++++++++++++++++++++ rector.php | 38 ++++++++++++++++++++++++++++++++++++ rector.yml | 54 --------------------------------------------------- 4 files changed, 82 insertions(+), 60 deletions(-) create mode 100644 ecs.php create mode 100644 rector.php delete mode 100644 rector.yml diff --git a/composer.json b/composer.json index e2415d7dd..24ede3a2a 100644 --- a/composer.json +++ b/composer.json @@ -22,16 +22,16 @@ "drupal/coder": "8.3.13", "drupal/composer_deploy": "^1.6", "drupal/core-dev": "~9.1.0", - "drupal/devel": "4.1.1", + "drupal/devel": "^4.1", "drupal/drupal-extension": "^4.1", - "drupal/upgrade_status": "^3.11", "jcalderonzumba/gastonjs": "~1.2.0", "jcalderonzumba/mink-phantomjs-driver": "~0.3.3", - "mglaman/drupal-check": "^1.0.0", - "mikey179/vfsstream": "~1.6.0", - "palantirnet/drupal-rector": "^0.11.4", - "phpspec/prophecy-phpunit": "^2", + "mglaman/drupal-check": "^1.2", + "mikey179/vfsstream": "^1.6", + "phpmd/phpmd": "^2.10", + "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "^1.1", + "phpstan/phpstan-deprecation-rules": "^1.0.0", "slevomat/coding-standard": "^7.0", "squizlabs/html_codesniffer": "*", "symplify/easy-coding-standard": "^9.4" @@ -71,6 +71,12 @@ "only": ["goalgorilla/open_social", "drupal/social"] } }, + "scripts": { + "refresh": [ + "rm -rf composer.lock vendor html/core html/modules/contrib html/profiles/contrib html/themes/contrib", + "@composer update -W --ansi" + ] + }, "extra": { "installer-types": [ "bower-asset", diff --git a/ecs.php b/ecs.php new file mode 100644 index 000000000..85f8e2965 --- /dev/null +++ b/ecs.php @@ -0,0 +1,32 @@ +services(); + /** + * Every property should have @var annotation .*/ + $services->set(ReturnTypeHintSniff::class); + + $parameters = $containerConfigurator->parameters(); + + $parameters->set(Option::SKIP, ['*/upgrade_status/tests/modules/*']); + $parameters->set(Option::FILE_EXTENSIONS, ['php', 'module', 'theme', 'install', 'profile', 'inc', 'engine']); + + $parameters->set(Option::SKIP, [ + // This part is needed, because `TypeHintDeclarationSniff` is actually mix of 7 rules we don't need + // (they also delete code, so be sure to have this section here) + 'SlevomatCodingStandard\Sniffs\TypeHints\TypeHintDeclarationSniff.UselessDocComment' => NULL, + 'SlevomatCodingStandard\Sniffs\TypeHints\TypeHintDeclarationSniff.MissingTraversablePropertyTypeHintSpecification' => NULL, + 'SlevomatCodingStandard\Sniffs\TypeHints\TypeHintDeclarationSniff.MissingTraversableReturnTypeHintSpecification' => NULL, + 'SlevomatCodingStandard\Sniffs\TypeHints\TypeHintDeclarationSniff.MissingTraversableParameterTypeHintSpecification' => NULL, + 'SlevomatCodingStandard\Sniffs\TypeHints\TypeHintDeclarationSniff.MissingParameterTypeHint' => NULL, + 'SlevomatCodingStandard\Sniffs\TypeHints\TypeHintDeclarationSniff.MissingReturnTypeHint' => NULL, + ]); +}; diff --git a/rector.php b/rector.php new file mode 100644 index 000000000..c367cf957 --- /dev/null +++ b/rector.php @@ -0,0 +1,38 @@ +import(__DIR__ . '/vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8-all-deprecations.php'); + $containerConfigurator->import(__DIR__ . '/vendor/palantirnet/drupal-rector/config/drupal-9/drupal-9-all-deprecations.php'); + + $parameters = $containerConfigurator->parameters(); + + $drupalFinder = new DrupalFinder(); + $drupalFinder->locateRoot(__DIR__); + $drupalRoot = $drupalFinder->getDrupalRoot(); + $parameters->set(Option::AUTOLOAD_PATHS, [ + $drupalRoot . '/core', + $drupalRoot . '/modules', + $drupalRoot . '/profiles', + $drupalRoot . '/themes', + ]); + + $parameters->set(Option::SKIP, ['*/upgrade_status/tests/modules/*']); + $parameters->set(Option::FILE_EXTENSIONS, ['php', 'module', 'theme', 'install', 'profile', 'inc', 'engine']); + $parameters->set(Option::AUTO_IMPORT_NAMES, TRUE); + $parameters->set(Option::IMPORT_SHORT_CLASSES, FALSE); + $parameters->set(Option::IMPORT_DOC_BLOCKS, FALSE); + + $parameters->set('drupal_rector_notices_as_comments', TRUE); +}; diff --git a/rector.yml b/rector.yml deleted file mode 100644 index c85eb5303..000000000 --- a/rector.yml +++ /dev/null @@ -1,54 +0,0 @@ -imports: - - { resource: "vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8-all-deprecations.yml" } - # includes: - # - { resource: "vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8.0-deprecations.yml" } - # - { resource: "vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8.1-deprecations.yml" } - # - { resource: "vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8.2-deprecations.yml" } - # - { resource: "vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8.3-deprecations.yml" } - # - { resource: "vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8.4-deprecations.yml" } - # - { resource: "vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8.5-deprecations.yml" } - # - { resource: "vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8.6-deprecations.yml" } - # - { resource: "vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8.7-deprecations.yml" } - # - { resource: "vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8.8-deprecations.yml" } - -parameters: - autoload_paths: - - 'html/core' - - 'html/core/modules' - - 'html/modules' - - 'html/profiles' - - 'vendor/autoload.php' - - exclude_paths: - # This path is used by the upgrade_status module. - - '*/upgrade_status/tests/modules/*' - # We will skip test directories because we will end-up in errors like: - # Ambiguous class Drupal\FunctionalJavascriptTests\Core\Form\JavascriptStatesTest resolution; - # defined in html/core/core/tests/Drupal/FunctionalJavascriptTests/Core/Form/JavascriptStatesTest.php - # and in html/core/tests/Drupal/FunctionalJavascriptTests/Core/Form/JavascriptStatesTest.php - - '*/tests/*' - - '*/Tests/*' - - file_extensions: - - module - - theme - - install - - profile - - inc - - engine - - # If you would like Rector to include PHPUnit 8 upgrades, uncomment the following lines: - # sets: - # - phpunit80 - - # Create `use` statements. - auto_import_names: true - # Do not convert `\Drupal` to `Drupal`, etc. - import_short_classes: false - # This will not import classes used in PHP DocBlocks, like in /** @var \Some\Class */ - import_doc_blocks: false - - # This will add comments to call out edge cases in replacements. - drupal_rector_notices_as_comments: true - -services: ~ From eb5e5325c2dcdafa289930753cab4c36f01f5d4d Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Mon, 15 Nov 2021 21:21:04 +0530 Subject: [PATCH 05/14] Upgrade mariadb to latest version. 1. Also because of Drupal 9 requirement's for database. 2. See: https://www.drupal.org/docs/understanding-drupal/how-drupal-9-was-made-and-what-is-included/environment-requirements-of-drupal-9#s-database-backend-and-other-hosting-requirements --- docker-compose-ci.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index 230840c32..5743b2d34 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -29,7 +29,7 @@ services: container_name: social_ci_web db: - image: mariadb:10.2 + image: mariadb:10.7 environment: - MYSQL_ROOT_PASSWORD=root - MYSQL_DATABASE=social diff --git a/docker-compose.yml b/docker-compose.yml index 9f6d67d03..06f4acb4b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: container_name: social_web db: - image: mariadb:10.2 + image: mariadb:10.7 environment: - MYSQL_ROOT_PASSWORD=root - MYSQL_DATABASE=social From d4831f21b358795d91405bb0c069d639450cec22 Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Mon, 15 Nov 2021 21:31:03 +0530 Subject: [PATCH 06/14] Removed mglaman/drupal-check and added upgrade_status module. 1. See: https://www.drupal.org/docs/upgrading-drupal/how-to-prepare-your-drupal-7-or-8-site-for-drupal-9/upgrading-a-drupal-8-site 2. See: https://www.drupal.org/docs/updating-drupal/how-to-prepare-your-drupal-7-or-8-site-for-drupal-9/deprecation-checking-and#s-use-the-drupal-8-branch-of-upgrade-status-for-full-site-reporting. 3. Removing mglaman/drupal-check in favor of mglaman/phpstan-drupal with phpstan/extension-installer and phpstan/phpstan-deprecation-rules. 4. See: https://drupal.slack.com/archives/CDDD98AMN/p1636715151099300. --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 24ede3a2a..b1513a0d3 100644 --- a/composer.json +++ b/composer.json @@ -24,14 +24,15 @@ "drupal/core-dev": "~9.1.0", "drupal/devel": "^4.1", "drupal/drupal-extension": "^4.1", + "drupal/upgrade_status": "^3.11", "jcalderonzumba/gastonjs": "~1.2.0", "jcalderonzumba/mink-phantomjs-driver": "~0.3.3", - "mglaman/drupal-check": "^1.2", + "mglaman/phpstan-drupal": "^1.0", "mikey179/vfsstream": "^1.6", "phpmd/phpmd": "^2.10", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan-deprecation-rules": "^1.0.0", + "phpstan/phpstan-deprecation-rules": "^1.0", "slevomat/coding-standard": "^7.0", "squizlabs/html_codesniffer": "*", "symplify/easy-coding-standard": "^9.4" From 525ed034454525574b09472b5a96bc697c53d19e Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Wed, 17 Nov 2021 20:52:02 +0530 Subject: [PATCH 07/14] Added parallel processing in ecs and more rector rules in rector.php --- ecs.php | 3 ++- rector.php | 30 +++++++++++++++++++++++++++--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ecs.php b/ecs.php index 85f8e2965..8140f0a47 100644 --- a/ecs.php +++ b/ecs.php @@ -15,7 +15,8 @@ $services->set(ReturnTypeHintSniff::class); $parameters = $containerConfigurator->parameters(); - + // Ena Parallel run. + $parameters->set(Option::PARALLEL, true); $parameters->set(Option::SKIP, ['*/upgrade_status/tests/modules/*']); $parameters->set(Option::FILE_EXTENSIONS, ['php', 'module', 'theme', 'install', 'profile', 'inc', 'engine']); diff --git a/rector.php b/rector.php index c367cf957..602fc032d 100644 --- a/rector.php +++ b/rector.php @@ -6,16 +6,25 @@ declare(strict_types=1); +use Rector\Core\ValueObject\PhpVersion; use DrupalFinder\DrupalFinder; use Rector\Core\Configuration\Option; +use Rector\Doctrine\Set\DoctrineSetList; +use Rector\Php74\Rector\Property\TypedPropertyRector; +use Rector\Set\ValueObject\SetList; +use Rector\TypeDeclaration\Rector\FunctionLike\ParamTypeDeclarationRector; +use Rector\TypeDeclaration\Rector\FunctionLike\ReturnTypeDeclarationRector; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; - +use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromReturnNewRector; +use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedCallRector; +use Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictTypedPropertyRector; +use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector; return static function (ContainerConfigurator $containerConfigurator): void { // @todo find out how to only load the relevant rector rules. // Should we try and load \Drupal::VERSION and check? $containerConfigurator->import(__DIR__ . '/vendor/palantirnet/drupal-rector/config/drupal-8/drupal-8-all-deprecations.php'); $containerConfigurator->import(__DIR__ . '/vendor/palantirnet/drupal-rector/config/drupal-9/drupal-9-all-deprecations.php'); - + $containerConfigurator->import(SetList::PHP_74); $parameters = $containerConfigurator->parameters(); $drupalFinder = new DrupalFinder(); @@ -28,11 +37,26 @@ $drupalRoot . '/themes', ]); + $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_74); $parameters->set(Option::SKIP, ['*/upgrade_status/tests/modules/*']); $parameters->set(Option::FILE_EXTENSIONS, ['php', 'module', 'theme', 'install', 'profile', 'inc', 'engine']); $parameters->set(Option::AUTO_IMPORT_NAMES, TRUE); $parameters->set(Option::IMPORT_SHORT_CLASSES, FALSE); $parameters->set(Option::IMPORT_DOC_BLOCKS, FALSE); - $parameters->set('drupal_rector_notices_as_comments', TRUE); + $services = $containerConfigurator->services(); + $services->set(ReturnTypeFromReturnNewRector::class); + $services->set(ReturnTypeFromStrictTypedPropertyRector::class); + $services->set(ReturnTypeFromStrictTypedCallRector::class); + $services->set(TypedPropertyFromStrictConstructorRector::class); + $services->set(TypedPropertyRector::class); + $services->set(ReturnTypeDeclarationRector::class); + $services->set(ParamTypeDeclarationRector::class); + $containerConfigurator->import(DoctrineSetList::DOCTRINE_CODE_QUALITY); + // Auto import fully qualified class names? [default: false]. + $parameters->set(Option::AUTO_IMPORT_NAMES, TRUE); + // Skip classes used in PHP DocBlocks, like in /** @var \Some\Class */ [default: true]. + $parameters->set(Option::IMPORT_DOC_BLOCKS, FALSE); + // Path to phpstan with extensions, that PHPSTan in Rector uses to determine types. + $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, getcwd() . '/html/profiles/contrib/social/phpstan.neon'); }; From a4ab05e9f0dcc2ae18e6d8cd2433f0a1e1e6d74c Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Thu, 18 Nov 2021 22:45:39 +0530 Subject: [PATCH 08/14] Added a forked branch of palantirnet/drupal-rector. It fixes the conflicts with phpstan-drupal due to PHPStan versions. This fork resolves the conflicts. --- composer.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/composer.json b/composer.json index b1513a0d3..f96ce89c2 100644 --- a/composer.json +++ b/composer.json @@ -29,6 +29,7 @@ "jcalderonzumba/mink-phantomjs-driver": "~0.3.3", "mglaman/phpstan-drupal": "^1.0", "mikey179/vfsstream": "^1.6", + "palantirnet/drupal-rector": "3248684.x-dev", "phpmd/phpmd": "^2.10", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "^1.1", @@ -70,6 +71,11 @@ "type": "git", "url": "https://github.com/goalgorilla/open_social.git", "only": ["goalgorilla/open_social", "drupal/social"] + }, + "4": { + "type": "vcs", + "url": "https://github.com/bluehorndigital/drupal-rector.git", + "only": ["palantirnet/drupal-rector"] } }, "scripts": { From da58aa42bd75f7a8a43e7ef140deffe6edccea61 Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Fri, 19 Nov 2021 21:02:18 +0530 Subject: [PATCH 09/14] Removed the temporary branch added for palantirnet/drupal-rector and added stable tag in favor of new release. 1. The PR https://github.com/palantirnet/drupal-rector/pull/185 was merged. 2. See: https://github.com/palantirnet/drupal-rector/releases/tag/0.12.0 --- composer.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index f96ce89c2..ee064f874 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "jcalderonzumba/mink-phantomjs-driver": "~0.3.3", "mglaman/phpstan-drupal": "^1.0", "mikey179/vfsstream": "^1.6", - "palantirnet/drupal-rector": "3248684.x-dev", + "palantirnet/drupal-rector": "^0.12.0", "phpmd/phpmd": "^2.10", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "^1.1", @@ -59,7 +59,7 @@ "type": "package", "package": { "name": "squizlabs/html_codesniffer", - "version": "1.0.0", + "version": "2.5.1", "source": { "url": "https://github.com/squizlabs/HTML_CodeSniffer.git", "type": "git", @@ -71,11 +71,6 @@ "type": "git", "url": "https://github.com/goalgorilla/open_social.git", "only": ["goalgorilla/open_social", "drupal/social"] - }, - "4": { - "type": "vcs", - "url": "https://github.com/bluehorndigital/drupal-rector.git", - "only": ["palantirnet/drupal-rector"] } }, "scripts": { From 9e3023c6821e183757e007af6a11e14e8f0b8f30 Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Sun, 21 Nov 2021 18:39:31 +0530 Subject: [PATCH 10/14] Added changes to install "D9" based docker image of opensocial. 1. Changed dev to d9 tag for docker image. 2. Added Solr 8 configuration. 3. Upgraded selenium/standalone-firefox-debug image to install. --- docker-compose.blackfire.yml | 4 +- docker-compose.yml | 8 +- docker/solr/8.x/drupal/accents_en.txt | 164 ++++ docker/solr/8.x/drupal/accents_und.txt | 148 ++++ docker/solr/8.x/drupal/elevate.xml | 27 + docker/solr/8.x/drupal/protwords_en.txt | 1 + docker/solr/8.x/drupal/protwords_und.txt | 1 + docker/solr/8.x/drupal/schema.xml | 474 ++++++++++ .../solr/8.x/drupal/schema_extra_fields.xml | 89 ++ docker/solr/8.x/drupal/schema_extra_types.xml | 228 +++++ docker/solr/8.x/drupal/solrconfig.xml | 811 ++++++++++++++++++ docker/solr/8.x/drupal/solrconfig_extra.xml | 188 ++++ docker/solr/8.x/drupal/solrconfig_index.xml | 0 docker/solr/8.x/drupal/solrconfig_query.xml | 47 + .../drupal/solrconfig_requestdispatcher.xml | 6 + docker/solr/8.x/drupal/solrcore.properties | 13 + docker/solr/8.x/drupal/stopwords_en.txt | 35 + docker/solr/8.x/drupal/stopwords_und.txt | 1 + docker/solr/8.x/drupal/synonyms_en.txt | 1 + docker/solr/8.x/drupal/synonyms_und.txt | 1 + 20 files changed, 2241 insertions(+), 6 deletions(-) create mode 100644 docker/solr/8.x/drupal/accents_en.txt create mode 100644 docker/solr/8.x/drupal/accents_und.txt create mode 100644 docker/solr/8.x/drupal/elevate.xml create mode 100644 docker/solr/8.x/drupal/protwords_en.txt create mode 100644 docker/solr/8.x/drupal/protwords_und.txt create mode 100644 docker/solr/8.x/drupal/schema.xml create mode 100644 docker/solr/8.x/drupal/schema_extra_fields.xml create mode 100644 docker/solr/8.x/drupal/schema_extra_types.xml create mode 100644 docker/solr/8.x/drupal/solrconfig.xml create mode 100644 docker/solr/8.x/drupal/solrconfig_extra.xml create mode 100644 docker/solr/8.x/drupal/solrconfig_index.xml create mode 100644 docker/solr/8.x/drupal/solrconfig_query.xml create mode 100644 docker/solr/8.x/drupal/solrconfig_requestdispatcher.xml create mode 100644 docker/solr/8.x/drupal/solrcore.properties create mode 100644 docker/solr/8.x/drupal/stopwords_en.txt create mode 100644 docker/solr/8.x/drupal/stopwords_und.txt create mode 100644 docker/solr/8.x/drupal/synonyms_en.txt create mode 100644 docker/solr/8.x/drupal/synonyms_und.txt diff --git a/docker-compose.blackfire.yml b/docker-compose.blackfire.yml index beeb9bd29..38c987fd2 100644 --- a/docker-compose.blackfire.yml +++ b/docker-compose.blackfire.yml @@ -2,7 +2,7 @@ version: "2" services: web: - image: goalgorilla/open_social_docker:dev + image: goalgorilla/open_social_docker:d9 volumes: - ./:/var/www:delegated links: @@ -58,7 +58,7 @@ services: container_name: social_selenium behat: - image: goalgorilla/open_social_docker:dev + image: goalgorilla/open_social_docker:d9 volumes: - ./:/var/www:delegated links: diff --git a/docker-compose.yml b/docker-compose.yml index 06f4acb4b..e0a1e01d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: web: - image: goalgorilla/open_social_docker:dev + image: goalgorilla/open_social_docker:d9 volumes: - ./:/var/www:delegated links: @@ -42,7 +42,7 @@ services: container_name: social_mailcatcher selenium: - image: selenium/standalone-firefox-debug:2.48.2 + image: selenium/standalone-firefox-debug:3.141.59 volumes: - ./html/profiles/contrib/social/tests/behat/features/files/:/files:delegated links: @@ -57,7 +57,7 @@ services: container_name: social_selenium behat: - image: goalgorilla/open_social_docker:dev + image: goalgorilla/open_social_docker:d9 volumes: - ./:/var/www:delegated links: @@ -82,7 +82,7 @@ services: container_name: social_cron solr: - image: solr:6.6 + image: solr:8.11 hostname: solr volumes: - os_solr_data:/opt/solr/server/solr/mycores diff --git a/docker/solr/8.x/drupal/accents_en.txt b/docker/solr/8.x/drupal/accents_en.txt new file mode 100644 index 000000000..bed051477 --- /dev/null +++ b/docker/solr/8.x/drupal/accents_en.txt @@ -0,0 +1,164 @@ +# À => A +"\u00C0" => "A" +# Á => A +"\u00C1" => "A" +#  => A +"\u00C2" => "A" +# à => A +"\u00C3" => "A" +# Ä => A +"\u00C4" => "A" +# Å => A +"\u00C5" => "A" +# Ą => A +"\u0104" => "A" +# Æ => AE +"\u00C6" => "AE" +# Ç => C +"\u00C7" => "C" +# Ć => C +"\U0106" => "C" +# È => E +"\u00C8" => "E" +# É => E +"\u00C9" => "E" +# Ê => E +"\u00CA" => "E" +# Ë => E +"\u00CB" => "E" +# Ę => E +"\u0118" => "E" +# Ì => I +"\u00CC" => "I" +# Í => I +"\u00CD" => "I" +# Î => I +"\u00CE" => "I" +# Ï => I +"\u00CF" => "I" +# IJ => IJ +"\u0132" => "IJ" +# Ð => D +"\u00D0" => "D" +# Ł => L +"\u0141" => "L" +# Ñ => N +"\u00D1" => "N" +# Ń => N +"\u0143" => "N" +# Ò => O +"\u00D2" => "O" +# Ó => O +"\u00D3" => "O" +# Ô => O +"\u00D4" => "O" +# Õ => O +"\u00D5" => "O" +# Ö => O +"\u00D6" => "O" +# Ø => O +"\u00D8" => "O" +# Œ => OE +"\u0152" => "OE" +# Þ +"\u00DE" => "TH" +# Ù => U +"\u00D9" => "U" +# Ú => U +"\u00DA" => "U" +# Û => U +"\u00DB" => "U" +# Ü => U +"\u00DC" => "U" +# Ý => Y +"\u00DD" => "Y" +# Ÿ => Y +"\u0178" => "Y" +# à => a +"\u00E0" => "a" +# á => a +"\u00E1" => "a" +# â => a +"\u00E2" => "a" +# ã => a +"\u00E3" => "a" +# ä => a +"\u00E4" => "a" +# å => a +"\u00E5" => "a" +# æ => ae +"\u00E6" => "ae" +# ç => c +"\u00E7" => "c" +# è => e +"\u00E8" => "e" +# é => e +"\u00E9" => "e" +# ê => e +"\u00EA" => "e" +# ë => e +"\u00EB" => "e" +# ì => i +"\u00EC" => "i" +# í => i +"\u00ED" => "i" +# î => i +"\u00EE" => "i" +# ï => i +"\u00EF" => "i" +# ij => ij +"\u0133" => "ij" +# ð => d +"\u00F0" => "d" +# ñ => n +"\u00F1" => "n" +# ò => o +"\u00F2" => "o" +# ó => o +"\u00F3" => "o" +# ô => o +"\u00F4" => "o" +# õ => o +"\u00F5" => "o" +# ö => o +"\u00F6" => "o" +# ø => o +"\u00F8" => "o" +# œ => oe +"\u0153" => "oe" +# ß => ss +"\u00DF" => "ss" +# Ś => S +"\u015a" => "S" +# þ => th +"\u00FE" => "th" +# ù => u +"\u00F9" => "u" +# ú => u +"\u00FA" => "u" +# û => u +"\u00FB" => "u" +# ü => u +"\u00FC" => "u" +# ý => y +"\u00FD" => "y" +# ÿ => y +"\u00FF" => "y" +# Ź => Z +"\u0179" => "Z" +# Ż => Z +"\u017b" => "Z" +# ff => ff +"\uFB00" => "ff" +# fi => fi +"\uFB01" => "fi" +# fl => fl +"\uFB02" => "fl" +# ffi => ffi +"\uFB03" => "ffi" +# ffl => ffl +"\uFB04" => "ffl" +# ſt => st +"\uFB05" => "st" +# st => st +"\uFB06" => "st" diff --git a/docker/solr/8.x/drupal/accents_und.txt b/docker/solr/8.x/drupal/accents_und.txt new file mode 100644 index 000000000..7c883f87a --- /dev/null +++ b/docker/solr/8.x/drupal/accents_und.txt @@ -0,0 +1,148 @@ +# À => A +"\u00C0" => "A" +# Á => A +"\u00C1" => "A" +#  => A +"\u00C2" => "A" +# à => A +"\u00C3" => "A" +# Ä => A +"\u00C4" => "A" +# Å => A +"\u00C5" => "A" +# Æ => AE +"\u00C6" => "AE" +# Ç => C +"\u00C7" => "C" +# È => E +"\u00C8" => "E" +# É => E +"\u00C9" => "E" +# Ê => E +"\u00CA" => "E" +# Ë => E +"\u00CB" => "E" +# Ì => I +"\u00CC" => "I" +# Í => I +"\u00CD" => "I" +# Î => I +"\u00CE" => "I" +# Ï => I +"\u00CF" => "I" +# IJ => IJ +"\u0132" => "IJ" +# Ð => D +"\u00D0" => "D" +# Ñ => N +"\u00D1" => "N" +# Ò => O +"\u00D2" => "O" +# Ó => O +"\u00D3" => "O" +# Ô => O +"\u00D4" => "O" +# Õ => O +"\u00D5" => "O" +# Ö => O +"\u00D6" => "O" +# Ø => O +"\u00D8" => "O" +# Œ => OE +"\u0152" => "OE" +# Þ +"\u00DE" => "TH" +# Ù => U +"\u00D9" => "U" +# Ú => U +"\u00DA" => "U" +# Û => U +"\u00DB" => "U" +# Ü => U +"\u00DC" => "U" +# Ý => Y +"\u00DD" => "Y" +# Ÿ => Y +"\u0178" => "Y" +# à => a +"\u00E0" => "a" +# á => a +"\u00E1" => "a" +# â => a +"\u00E2" => "a" +# ã => a +"\u00E3" => "a" +# ä => a +"\u00E4" => "a" +# å => a +"\u00E5" => "a" +# æ => ae +"\u00E6" => "ae" +# ç => c +"\u00E7" => "c" +# è => e +"\u00E8" => "e" +# é => e +"\u00E9" => "e" +# ê => e +"\u00EA" => "e" +# ë => e +"\u00EB" => "e" +# ì => i +"\u00EC" => "i" +# í => i +"\u00ED" => "i" +# î => i +"\u00EE" => "i" +# ï => i +"\u00EF" => "i" +# ij => ij +"\u0133" => "ij" +# ð => d +"\u00F0" => "d" +# ñ => n +"\u00F1" => "n" +# ò => o +"\u00F2" => "o" +# ó => o +"\u00F3" => "o" +# ô => o +"\u00F4" => "o" +# õ => o +"\u00F5" => "o" +# ö => o +"\u00F6" => "o" +# ø => o +"\u00F8" => "o" +# œ => oe +"\u0153" => "oe" +# ß => ss +"\u00DF" => "ss" +# þ => th +"\u00FE" => "th" +# ù => u +"\u00F9" => "u" +# ú => u +"\u00FA" => "u" +# û => u +"\u00FB" => "u" +# ü => u +"\u00FC" => "u" +# ý => y +"\u00FD" => "y" +# ÿ => y +"\u00FF" => "y" +# ff => ff +"\uFB00" => "ff" +# fi => fi +"\uFB01" => "fi" +# fl => fl +"\uFB02" => "fl" +# ffi => ffi +"\uFB03" => "ffi" +# ffl => ffl +"\uFB04" => "ffl" +# ſt => st +"\uFB05" => "st" +# st => st +"\uFB06" => "st" diff --git a/docker/solr/8.x/drupal/elevate.xml b/docker/solr/8.x/drupal/elevate.xml new file mode 100644 index 000000000..193a0e727 --- /dev/null +++ b/docker/solr/8.x/drupal/elevate.xml @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/docker/solr/8.x/drupal/protwords_en.txt b/docker/solr/8.x/drupal/protwords_en.txt new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/docker/solr/8.x/drupal/protwords_en.txt @@ -0,0 +1 @@ + diff --git a/docker/solr/8.x/drupal/protwords_und.txt b/docker/solr/8.x/drupal/protwords_und.txt new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/docker/solr/8.x/drupal/protwords_und.txt @@ -0,0 +1 @@ + diff --git a/docker/solr/8.x/drupal/schema.xml b/docker/solr/8.x/drupal/schema.xml new file mode 100644 index 000000000..cb0d7a600 --- /dev/null +++ b/docker/solr/8.x/drupal/schema.xml @@ -0,0 +1,474 @@ + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + &extrafields; + + + &extratypes; + + + id + + + + + diff --git a/docker/solr/8.x/drupal/schema_extra_fields.xml b/docker/solr/8.x/drupal/schema_extra_fields.xml new file mode 100644 index 000000000..f5d74188a --- /dev/null +++ b/docker/solr/8.x/drupal/schema_extra_fields.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docker/solr/8.x/drupal/schema_extra_types.xml b/docker/solr/8.x/drupal/schema_extra_types.xml new file mode 100644 index 000000000..8b5e82f03 --- /dev/null +++ b/docker/solr/8.x/drupal/schema_extra_types.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docker/solr/8.x/drupal/solrconfig.xml b/docker/solr/8.x/drupal/solrconfig.xml new file mode 100644 index 000000000..cdcebc19f --- /dev/null +++ b/docker/solr/8.x/drupal/solrconfig.xml @@ -0,0 +1,811 @@ + + + + + + +]> + + + + + + + ${solr.abortOnConfigurationError:true} + + + ${solr.luceneMatchVersion:LUCENE_70} + + + + + + + + + + + + + + + + + + + + + ${solr.data.dir:} + + + + + + + + + ${solr.hdfs.home:} + + ${solr.hdfs.confdir:} + + ${solr.hdfs.blockcache.enabled:true} + + ${solr.hdfs.blockcache.global:true} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${solr.lock.type:native} + + + + + + + + + + + + + true + + + &index; + + + + + + + + + ${solr.ulog.dir:} + + + + + ${solr.autoCommit.MaxDocs:-1} + ${solr.autoCommit.MaxTime:15000} + false + + + + + + ${solr.autoSoftCommit.MaxDocs:-1} + ${solr.autoSoftCommit.MaxTime:-1} + + + + + + + + + + + + + + + + &query; + + + + + + + + + + + + static firstSearcher warming in solrconfig.xml + + + + + + false + + + + + + + + + &requestdispatcher; + + + + + + + &extra; + + + + + + + + + 100 + + + + + + + + 70 + + 0.5 + + [-\w ,/\n\"']{20,200} + + + + + + + ]]> + ]]> + + + + + + + + + + + + + + + + + + + + + + + + ,, + ,, + ,, + ,, + ,]]> + ]]> + + + + + + 10 + .,!? + + + + + + + WORD + + + en + US + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + + + + + + + + + + + + + + diff --git a/docker/solr/8.x/drupal/solrconfig_extra.xml b/docker/solr/8.x/drupal/solrconfig_extra.xml new file mode 100644 index 000000000..77e133ed7 --- /dev/null +++ b/docker/solr/8.x/drupal/solrconfig_extra.xml @@ -0,0 +1,188 @@ + + + en + spellcheck_en + solr.DirectSolrSpellChecker + internal + 0.5 + 2 + 1 + 5 + 4 + 0.01 + .01 + true + + + + und + spellcheck_und + solr.DirectSolrSpellChecker + internal + 0.5 + 2 + 1 + 5 + 4 + 0.01 + .01 + true + + + + + en + AnalyzingInfixLookupFactory + DocumentDictionaryFactory + twm_suggest + text_en + sm_context_tags + true + false + + + + und + AnalyzingInfixLookupFactory + DocumentDictionaryFactory + twm_suggest + text_und + sm_context_tags + true + false + + + + + + false + false + false + true + false + 1 + false + 10 + + + terms + spellcheck + suggest + + + + + + + true + ignored_ + true + links + ignored_ + + + + + + + 1 + 1 + false + ${solr.mlt.timeAllowed:2000} + + + + + + + id + und + on + false + false + 1 + 5 + 5 + true + true + 10 + 5 + + + spellcheck + + + + + + + true + und + 10 + + + suggest + + + + + + + lucene + id + explicit + true + ${solr.selectSearchHandler.timeAllowed:-1} + false + + + spellcheck + elevator + + + + + + + id + true + + + tvComponent + + + + + + string + elevate.xml + + + diff --git a/docker/solr/8.x/drupal/solrconfig_index.xml b/docker/solr/8.x/drupal/solrconfig_index.xml new file mode 100644 index 000000000..e69de29bb diff --git a/docker/solr/8.x/drupal/solrconfig_query.xml b/docker/solr/8.x/drupal/solrconfig_query.xml new file mode 100644 index 000000000..5bdd69690 --- /dev/null +++ b/docker/solr/8.x/drupal/solrconfig_query.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + true + + false + + 20 + 200 + 1024 diff --git a/docker/solr/8.x/drupal/solrconfig_requestdispatcher.xml b/docker/solr/8.x/drupal/solrconfig_requestdispatcher.xml new file mode 100644 index 000000000..3a3f17d1c --- /dev/null +++ b/docker/solr/8.x/drupal/solrconfig_requestdispatcher.xml @@ -0,0 +1,6 @@ + + + diff --git a/docker/solr/8.x/drupal/solrcore.properties b/docker/solr/8.x/drupal/solrcore.properties new file mode 100644 index 000000000..b31dae608 --- /dev/null +++ b/docker/solr/8.x/drupal/solrcore.properties @@ -0,0 +1,13 @@ +solr.replication.master=false +solr.replication.slave=false +solr.replication.pollInterval=00:00:60 +solr.replication.masterUrl=http://localhost:8983/solr +solr.replication.confFiles=schema.xml,schema_extra_types.xml,schema_extra_fields.xml,elevate.xml,stopwords_en.txt,synonyms_en.txt,protwords_en.txt,accents_en.txt,stopwords_und.txt,synonyms_und.txt,protwords_und.txt,accents_und.txt +solr.mlt.timeAllowed=2000 +solr.luceneMatchVersion=8.6 +solr.selectSearchHandler.timeAllowed=-1 +solr.autoCommit.MaxDocs=-1 +solr.autoCommit.MaxTime=15000 +solr.autoSoftCommit.MaxDocs=-1 +solr.autoSoftCommit.MaxTime=-1 +solr.install.dir=/opt/solr diff --git a/docker/solr/8.x/drupal/stopwords_en.txt b/docker/solr/8.x/drupal/stopwords_en.txt new file mode 100644 index 000000000..698105071 --- /dev/null +++ b/docker/solr/8.x/drupal/stopwords_en.txt @@ -0,0 +1,35 @@ +a +an +and +are +as +at +be +but +by +for +if +in +into +is +it +no +not +of +on +or +s +such +t +that +the +their +then +there +these +they +this +to +was +will +with diff --git a/docker/solr/8.x/drupal/stopwords_und.txt b/docker/solr/8.x/drupal/stopwords_und.txt new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/docker/solr/8.x/drupal/stopwords_und.txt @@ -0,0 +1 @@ + diff --git a/docker/solr/8.x/drupal/synonyms_en.txt b/docker/solr/8.x/drupal/synonyms_en.txt new file mode 100644 index 000000000..91689ff92 --- /dev/null +++ b/docker/solr/8.x/drupal/synonyms_en.txt @@ -0,0 +1 @@ +drupal, durpal diff --git a/docker/solr/8.x/drupal/synonyms_und.txt b/docker/solr/8.x/drupal/synonyms_und.txt new file mode 100644 index 000000000..91689ff92 --- /dev/null +++ b/docker/solr/8.x/drupal/synonyms_und.txt @@ -0,0 +1 @@ +drupal, durpal From e5f9552b65008b3c2462d766c2f5632d11ba48bb Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Tue, 7 Dec 2021 16:37:58 +0530 Subject: [PATCH 11/14] Revert the open_social docker image to dev tag. --- docker-compose.blackfire.yml | 4 ++-- docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.blackfire.yml b/docker-compose.blackfire.yml index 38c987fd2..beeb9bd29 100644 --- a/docker-compose.blackfire.yml +++ b/docker-compose.blackfire.yml @@ -2,7 +2,7 @@ version: "2" services: web: - image: goalgorilla/open_social_docker:d9 + image: goalgorilla/open_social_docker:dev volumes: - ./:/var/www:delegated links: @@ -58,7 +58,7 @@ services: container_name: social_selenium behat: - image: goalgorilla/open_social_docker:d9 + image: goalgorilla/open_social_docker:dev volumes: - ./:/var/www:delegated links: diff --git a/docker-compose.yml b/docker-compose.yml index e0a1e01d4..759895946 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: web: - image: goalgorilla/open_social_docker:d9 + image: goalgorilla/open_social_docker:dev volumes: - ./:/var/www:delegated links: @@ -57,7 +57,7 @@ services: container_name: social_selenium behat: - image: goalgorilla/open_social_docker:d9 + image: goalgorilla/open_social_docker:dev volumes: - ./:/var/www:delegated links: From 6255dd58966d76a8eaad3cb52ac0bb7c9511d6ba Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Tue, 7 Dec 2021 20:40:53 +0530 Subject: [PATCH 12/14] Updated PHP, mariabdb and solr configuration version in all docker compose files. --- .travis.yml | 2 +- docker-compose-ci.yml | 6 +++--- docker-compose.blackfire.yml | 8 ++++---- docker-compose.yml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index de0314098..50185504d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ addons: language: php php: - - 7.3 + - 7.4 services: - docker diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index 5743b2d34..039c85f7d 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -52,7 +52,7 @@ services: container_name: social_mailcatcher selenium: - image: selenium/standalone-firefox:2.48.2 + image: selenium/standalone-firefox-debug:3.141.59 links: - web:web volumes: @@ -81,11 +81,11 @@ services: container_name: social_ci_behat solr: - image: solr:6.6 + image: solr:8.11 hostname: solr volumes: - os_solr_data:/opt/solr/server/solr/mycores - - ./docker/solr/6.x/drupal/:/solr-conf/conf:cached + - ./docker/solr/8.x/drupal/:/solr-conf/conf:cached environment: - SOLR_SOLR_MEM_SIZE=512m - PARTIAL_SEARCH_ENABLED=false diff --git a/docker-compose.blackfire.yml b/docker-compose.blackfire.yml index beeb9bd29..e3866167b 100644 --- a/docker-compose.blackfire.yml +++ b/docker-compose.blackfire.yml @@ -20,7 +20,7 @@ services: container_name: social_web db: - image: mariadb:10.2 + image: mariadb:10.7 environment: - MYSQL_ROOT_PASSWORD=root - MYSQL_DATABASE=social @@ -43,7 +43,7 @@ services: container_name: social_mailcatcher selenium: - image: selenium/standalone-firefox-debug:2.48.2 + image: selenium/standalone-firefox-debug:3.141.59 volumes: - ./html/profiles/contrib/social/tests/behat/features/files/:/files:delegated links: @@ -94,11 +94,11 @@ services: container_name: social_cron solr: - image: solr:6.6 + image: solr:8.11 hostname: solr volumes: - os_solr_data:/opt/solr/server/solr/mycores - - ./docker/solr/6.x/drupal/:/solr-conf/conf:cached + - ./docker/solr/8.x/drupal/:/solr-conf/conf:cached environment: - SOLR_SOLR_MEM_SIZE=512m - PARTIAL_SEARCH_ENABLED=false diff --git a/docker-compose.yml b/docker-compose.yml index 759895946..40ec0795c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -86,7 +86,7 @@ services: hostname: solr volumes: - os_solr_data:/opt/solr/server/solr/mycores - - ./docker/solr/6.x/drupal/:/solr-conf/conf:cached + - ./docker/solr/8.x/drupal/:/solr-conf/conf:cached environment: - SOLR_SOLR_MEM_SIZE=512m - PARTIAL_SEARCH_ENABLED=false From ed990f0f4d9e6b1c0b1f651bf5d95421263070e8 Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Tue, 7 Dec 2021 21:41:49 +0530 Subject: [PATCH 13/14] Revert to image: selenium/standalone-firefox:2.48.2 --- docker-compose-ci.yml | 2 +- docker-compose.blackfire.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index 039c85f7d..973c7c01e 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -52,7 +52,7 @@ services: container_name: social_mailcatcher selenium: - image: selenium/standalone-firefox-debug:3.141.59 + image: selenium/standalone-firefox:2.48.2 links: - web:web volumes: diff --git a/docker-compose.blackfire.yml b/docker-compose.blackfire.yml index e3866167b..303680541 100644 --- a/docker-compose.blackfire.yml +++ b/docker-compose.blackfire.yml @@ -43,7 +43,7 @@ services: container_name: social_mailcatcher selenium: - image: selenium/standalone-firefox-debug:3.141.59 + image: selenium/standalone-firefox:2.48.2 volumes: - ./html/profiles/contrib/social/tests/behat/features/files/:/files:delegated links: diff --git a/docker-compose.yml b/docker-compose.yml index 40ec0795c..4fbcace83 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,7 +42,7 @@ services: container_name: social_mailcatcher selenium: - image: selenium/standalone-firefox-debug:3.141.59 + image: selenium/standalone-firefox:2.48.2 volumes: - ./html/profiles/contrib/social/tests/behat/features/files/:/files:delegated links: From f98ce8ef46f1f53e8c654525300759d29e8007c8 Mon Sep 17 00:00:00 2001 From: navneet0693 Date: Thu, 9 Dec 2021 21:01:47 +0530 Subject: [PATCH 14/14] Changed selenium/standalone-firefox to selenium/standalone-firefox-debug containers. --- docker-compose-ci.yml | 2 +- docker-compose.blackfire.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index 973c7c01e..2f901569d 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -52,7 +52,7 @@ services: container_name: social_mailcatcher selenium: - image: selenium/standalone-firefox:2.48.2 + image: selenium/standalone-firefox-debug:2.48.2 links: - web:web volumes: diff --git a/docker-compose.blackfire.yml b/docker-compose.blackfire.yml index 303680541..d460647ac 100644 --- a/docker-compose.blackfire.yml +++ b/docker-compose.blackfire.yml @@ -43,7 +43,7 @@ services: container_name: social_mailcatcher selenium: - image: selenium/standalone-firefox:2.48.2 + image: selenium/standalone-firefox-debug:2.48.2 volumes: - ./html/profiles/contrib/social/tests/behat/features/files/:/files:delegated links: diff --git a/docker-compose.yml b/docker-compose.yml index 4fbcace83..b5d9c243f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,7 +42,7 @@ services: container_name: social_mailcatcher selenium: - image: selenium/standalone-firefox:2.48.2 + image: selenium/standalone-firefox-debug:2.48.2 volumes: - ./html/profiles/contrib/social/tests/behat/features/files/:/files:delegated links: