drevops · AlexSkrypnyk · Apr 23, 2024 · Apr 23, 2024 · Apr 23, 2024 · Apr 23, 2024
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -171,8 +171,8 @@ jobs:
           name: Export DB after download
           command: |
             [ ! -f /tmp/download-db-success ] && echo "==> Database download semaphore file is missing. DB export will not proceed." && exit 0
-            docker compose up -d
-            sleep 15
+            ./scripts/drevops/login-docker.sh
+            docker compose up -d && sleep 15
             docker compose exec cli mkdir -p .data && docker compose cp -L .data/db.sql cli:/app/.data/db.sql || true
             docker compose exec $(env | cut -f1 -d= | sed 's/^/-e /') -T cli bash -c "DREVOPS_PROVISION_POST_OPERATIONS_SKIP=1 ./scripts/drevops/provision.sh"
             grep -q ^DREVOPS_DB_DOCKER_IMAGE .env && rm .data/db.sql || true
@@ -227,6 +227,9 @@ jobs:
             - v1.19.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
             - v1.19.0-db10-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-
       #;> !PROVISION_USE_PROFILE
+      - run:
+          name: Login to Docker registry
+          command: ./scripts/drevops/login-docker.sh
       - run:
           name: Build stack
           command: docker compose up -d

diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,7 @@ web/themes/**/node_modules
 web/themes/**/build
 .data
 .logs
+.twig-cs-fixer.cache
 
 # Ignore local override files.
 docker-compose.override.yml

diff --git a/composer.json b/composer.json
@@ -44,7 +44,7 @@
         "drevops/behat-screenshot": "^1",
         "drevops/behat-steps": "^2.2",
         "drupal/core-dev": "^10.2.0",
-        "drupal/drupal-extension": "^5@rc",
+        "drupal/drupal-extension": "^5",
         "mglaman/phpstan-drupal": "^1.2",
         "palantirnet/drupal-rector": "^0.20",
         "phpcompatibility/php-compatibility": "^9.3",
@@ -73,7 +73,7 @@
             "pyrech/composer-changelogs": true
         },
         "platform": {
-            "php": "8.2.13"
+            "php": "8.2.17"
         }
     },
     "autoload": {

diff --git a/docker-compose.override.default.yml b/docker-compose.override.default.yml
@@ -1,3 +1,8 @@
+# Local docker services override.
+#
+# Copy this file to docker-compose.override.yml and set relevant values.
+# docker-compose.override.yml is excluded from the repository,
+
 services:
   chrome:
     # Chrome image with Apple M1 support.

diff --git a/phpcs.xml b/phpcs.xml
@@ -17,8 +17,6 @@
     <arg name="colors"/>
     <arg value="sp"/>
     <arg name="parallel" value="75"/>
-    <!-- Lint code against platform version specified in composer.json key "config.platform.php". -->
-    <config name="testVersion" value="8.1"/>
 
     <!-- Exclude CircleCI config files. -->
     <exclude-pattern>circle\.yml</exclude-pattern>

diff --git a/rector.php b/rector.php
@@ -27,6 +27,7 @@
 use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
 use Rector\Set\ValueObject\SetList;
 use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
+use Rector\TypeDeclaration\Rector\StmtsAwareInterface\DeclareStrictTypesRector;
 
 return static function (RectorConfig $rectorConfig): void {
   $rectorConfig->paths([
@@ -37,6 +38,7 @@
     // Provided by Rector.
     SetList::PHP_80,
     SetList::PHP_81,
+    SetList::PHP_82,
     SetList::CODE_QUALITY,
     SetList::CODING_STYLE,
     SetList::DEAD_CODE,
@@ -48,6 +50,8 @@
     Drupal10SetList::DRUPAL_10,
   ]);
 
+  $rectorConfig->rule(DeclareStrictTypesRector::class);
+
   $drupalFinder = new DrupalFinder();
   $drupalFinder->locateRoot(__DIR__);
 
@@ -78,6 +82,7 @@
     '*/modules/contrib/*',
     '*/themes/contrib/*',
     '*/profiles/contrib/*',
+    '*/sites/default/default.settings.php',
     // Files.
     '*/sites/default/files/*',
     '*/sites/simpletest/*',

diff --git a/tests/behat/bootstrap/FeatureContext.php b/tests/behat/bootstrap/FeatureContext.php
@@ -5,6 +5,8 @@
  * YOURSITE Drupal context for Behat testing.
  */
 
+declare(strict_types=1);
+
 use DrevOps\BehatSteps\ContentTrait;
 use DrevOps\BehatSteps\FieldTrait;
 use DrevOps\BehatSteps\FileTrait;

diff --git a/tests/phpunit/CircleCiConfigTest.php b/tests/phpunit/CircleCiConfigTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Drupal\Core\Serialization\Yaml;
 use PHPUnit\Framework\TestCase;
 

diff --git a/tests/phpunit/Drupal/DatabaseSettingsTest.php b/tests/phpunit/Drupal/DatabaseSettingsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal;
 
 /**

diff --git a/tests/phpunit/Drupal/EnvironmentSettingsTest.php b/tests/phpunit/Drupal/EnvironmentSettingsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal;
 
 /**

diff --git a/tests/phpunit/Drupal/SettingsTestCase.php b/tests/phpunit/Drupal/SettingsTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal;
 
 use PHPUnit\Framework\TestCase;

diff --git a/tests/phpunit/Drupal/SwitchableSettingsTest.php b/tests/phpunit/Drupal/SwitchableSettingsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal;
 
 /**

diff --git a/web/modules/custom/ys_core/tests/src/Functional/ExampleTest.php b/web/modules/custom/ys_core/tests/src/Functional/ExampleTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\ys_core\Functional;
 
 /**

diff --git a/web/modules/custom/ys_core/tests/src/Functional/YsCoreFunctionalTestBase.php b/web/modules/custom/ys_core/tests/src/Functional/YsCoreFunctionalTestBase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\ys_core\Functional;
 
 use Drupal\Tests\BrowserTestBase;

diff --git a/web/modules/custom/ys_core/tests/src/Kernel/ExampleTest.php b/web/modules/custom/ys_core/tests/src/Kernel/ExampleTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\ys_core\Kernel;
 
 /**

diff --git a/web/modules/custom/ys_core/tests/src/Kernel/YsCoreKernelTestBase.php b/web/modules/custom/ys_core/tests/src/Kernel/YsCoreKernelTestBase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\ys_core\Kernel;
 
 use Drupal\KernelTests\KernelTestBase;

diff --git a/web/modules/custom/ys_core/tests/src/Traits/ArrayTrait.php b/web/modules/custom/ys_core/tests/src/Traits/ArrayTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\ys_core\Traits;
 
 /**

diff --git a/web/modules/custom/ys_core/tests/src/Traits/AssertTrait.php b/web/modules/custom/ys_core/tests/src/Traits/AssertTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\ys_core\Traits;
 
 /**

diff --git a/web/modules/custom/ys_core/tests/src/Traits/MockTrait.php b/web/modules/custom/ys_core/tests/src/Traits/MockTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\ys_core\Traits;
 
 use PHPUnit\Framework\MockObject\MockObject;

diff --git a/web/modules/custom/ys_core/tests/src/Traits/ReflectionTrait.php b/web/modules/custom/ys_core/tests/src/Traits/ReflectionTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\ys_core\Traits;
 
 /**

diff --git a/web/modules/custom/ys_core/tests/src/Unit/ExampleTest.php b/web/modules/custom/ys_core/tests/src/Unit/ExampleTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\ys_core\Unit;
 
 /**

diff --git a/web/modules/custom/ys_core/tests/src/Unit/YsCoreUnitTestBase.php b/web/modules/custom/ys_core/tests/src/Unit/YsCoreUnitTestBase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\ys_core\Unit;
 
 use Drupal\Tests\UnitTestCase;

diff --git a/web/modules/custom/ys_core/ys_core.deploy.php b/web/modules/custom/ys_core/ys_core.deploy.php
@@ -10,6 +10,8 @@
  * phpcs:disable Squiz.WhiteSpace.FunctionSpacing.After
  */
 
+declare(strict_types=1);
+
 use Drupal\Core\Extension\ExtensionDiscovery;
 
 /**

diff --git a/web/modules/custom/ys_core/ys_core.module b/web/modules/custom/ys_core/ys_core.module
@@ -5,6 +5,8 @@
  * Core module for YOURSITE.
  */
 
+declare(strict_types=1);
+
 use Drupal\Core\Site\Settings;
 
 /**

diff --git a/web/modules/custom/ys_search/ys_search.install b/web/modules/custom/ys_search/ys_search.install
@@ -5,6 +5,8 @@
  * Install for YOURSITE Search module.
  */
 
+declare(strict_types=1);
+
 /**
  * Implements hook_install().
  */

diff --git a/web/sites/default/default.settings.local.php b/web/sites/default/default.settings.local.php
@@ -5,6 +5,8 @@
  * Settings file for local environment.
  */
 
+declare(strict_types=1);
+
 // Show all error messages on the site.
 $config['system.logging']['error_level'] = 'all';
 

diff --git a/web/sites/default/includes/modules/settings.clamav.php b/web/sites/default/includes/modules/settings.clamav.php
@@ -5,6 +5,8 @@
  * ClamAV settings.
  */
 
+declare(strict_types=1);
+
 if (file_exists($contrib_path . '/clamav') && !empty(getenv('DRUPAL_CLAMAV_ENABLED'))) {
   $clamav_mode = getenv('DRUPAL_CLAMAV_MODE') ?: NULL;
   if (in_array(strtolower((string) $clamav_mode), ['0', 'daemon'])) {

diff --git a/web/sites/default/includes/modules/settings.config_split.php b/web/sites/default/includes/modules/settings.config_split.php
@@ -5,6 +5,8 @@
  * Config split settings.
  */
 
+declare(strict_types=1);
+
 switch ($settings['environment']) {
   case ENVIRONMENT_TEST:
     $config['config_split.config_split.test']['status'] = TRUE;

diff --git a/web/sites/default/includes/modules/settings.environment_indicator.php b/web/sites/default/includes/modules/settings.environment_indicator.php
@@ -5,6 +5,8 @@
  * Environment indicator settings.
  */
 
+declare(strict_types=1);
+
 $config['environment_indicator.indicator']['name'] = $settings['environment'];
 $config['environment_indicator.indicator']['bg_color'] = '#006600';
 $config['environment_indicator.indicator']['fg_color'] = '#ffffff';

diff --git a/web/sites/default/includes/modules/settings.fast404.php b/web/sites/default/includes/modules/settings.fast404.php
@@ -5,6 +5,8 @@
  * Fast404 settings.
  */
 
+declare(strict_types=1);
+
 if (file_exists($contrib_path . '/fast404/fast404.inc')) {
   // @codeCoverageIgnoreStart
   $settings['fast404_exts'] = '/^(?!robots).*\.(txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i';

diff --git a/web/sites/default/includes/modules/settings.redis.php b/web/sites/default/includes/modules/settings.redis.php
@@ -5,6 +5,8 @@
  * Redis configuration.
  */
 
+declare(strict_types=1);
+
 use Drupal\Component\Serialization\PhpSerialize;
 use Drupal\redis\Cache\CacheBackendFactory;
 use Drupal\redis\Cache\PhpRedis;

diff --git a/web/sites/default/includes/modules/settings.shield.php b/web/sites/default/includes/modules/settings.shield.php
@@ -5,6 +5,8 @@
  * Shield settings.
  */
 
+declare(strict_types=1);
+
 // Default Shield credentials.
 //
 // Shield can be enabled and disabled in production through UI.

diff --git a/web/sites/default/includes/modules/settings.stage_file_proxy.php b/web/sites/default/includes/modules/settings.stage_file_proxy.php
@@ -5,6 +5,8 @@
  * Stage file proxy settings.
  */
 
+declare(strict_types=1);
+
 $origin = getenv('DRUPAL_STAGE_FILE_PROXY_ORIGIN');
 if (!empty($origin) && $settings['environment'] != ENVIRONMENT_PROD) {
   $user = getenv('DRUPAL_SHIELD_USER');

diff --git a/web/sites/default/includes/providers/settings.acquia.php b/web/sites/default/includes/providers/settings.acquia.php
@@ -7,6 +7,8 @@
  * @see https://docs.acquia.com/acquia-cloud/develop/env-variable
  */
 
+declare(strict_types=1);
+
 if (!empty(getenv('AH_SITE_ENVIRONMENT'))) {
   // Delay the initial database connection.
   $config['acquia_hosting_settings_autoconnect'] = FALSE;

diff --git a/web/sites/default/includes/providers/settings.lagoon.php b/web/sites/default/includes/providers/settings.lagoon.php
@@ -5,6 +5,8 @@
  * Lagoon hosting provider settings.
  */
 
+declare(strict_types=1);
+
 if (getenv('LAGOON') && getenv('LAGOON_ENVIRONMENT_TYPE') == 'production' || getenv('LAGOON_ENVIRONMENT_TYPE') == 'development') {
   // Do not put any Lagoon-specific settings in this code block. It is used
   // to explicitly map Lagoon environments to $settings['environment']

diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php
@@ -19,6 +19,8 @@
  * phpcs:disable DrupalPractice.CodeAnalysis.VariableAnalysis.UnusedVariable
  */
 
+declare(strict_types=1);
+
 ////////////////////////////////////////////////////////////////////////////////
 ///                       ENVIRONMENT CONSTANTS                              ///
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/web/themes/custom/your_site_theme/tests/src/Functional/ExampleTest.php b/web/themes/custom/your_site_theme/tests/src/Functional/ExampleTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\your_site_theme\Functional;
 
 /**

diff --git a/web/themes/custom/your_site_theme/tests/src/Functional/YourSiteThemeFunctionalTestBase.php b/web/themes/custom/your_site_theme/tests/src/Functional/YourSiteThemeFunctionalTestBase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\your_site_theme\Functional;
 
 use Drupal\Tests\BrowserTestBase;

diff --git a/web/themes/custom/your_site_theme/tests/src/Kernel/ExampleTest.php b/web/themes/custom/your_site_theme/tests/src/Kernel/ExampleTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\your_site_theme\Kernel;
 
 /**

diff --git a/web/themes/custom/your_site_theme/tests/src/Kernel/YourSiteThemeKernelTestBase.php b/web/themes/custom/your_site_theme/tests/src/Kernel/YourSiteThemeKernelTestBase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\your_site_theme\Kernel;
 
 use Drupal\KernelTests\KernelTestBase;

diff --git a/web/themes/custom/your_site_theme/tests/src/Unit/ExampleTest.php b/web/themes/custom/your_site_theme/tests/src/Unit/ExampleTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Drupal\Tests\your_site_theme\Unit;
 
 /**