Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit d6ddbfe3338f · 2023-03-07T09:45:43.000+01:00
* 6.2:
  [GHA] use stubs instead of extensions for psalm job
  Wrap use of \Locale in a class_exists test
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -159,7 +159,7 @@ jobs:
           echo COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION >> $GITHUB_ENV
 
           echo "::group::composer update"
-          composer require --dev --no-update mongodb/mongodb:"^1.11"
+          composer require --dev --no-update mongodb/mongodb
           composer update --no-progress --ansi
           echo "::endgroup::"
 
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -21,28 +21,11 @@ jobs:
 
     env:
       php-version: '8.1'
-      extensions: json,couchbase,memcached,mongodb,redis,xsl,ldap,dom,relay
     steps:
-      - name: Setup cache environment
-        id: extcache
-        uses: shivammathur/cache-extensions@v1
-        with:
-          php-version: ${{ env.php-version }}
-          extensions: ${{ env.extensions }}
-          key: cache-v1 # can be any string, change to clear the extension cache.
-
-      - name: Cache extensions
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.extcache.outputs.dir }}
-          key: ${{ steps.extcache.outputs.key }}
-          restore-keys: ${{ steps.extcache.outputs.key }}
-
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ env.php-version }}
-          extensions: ${{ env.extensions }}
           ini-values: "memory_limit=-1"
           coverage: none
 
@@ -60,7 +43,7 @@ jobs:
           ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
           export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
           composer remove --dev --no-update --no-interaction symfony/phpunit-bridge
-          composer require --no-progress --ansi --no-plugins psalm/phar phpunit/phpunit:^9.5 php-http/discovery psr/event-dispatcher mongodb/mongodb
+          composer require --no-progress --ansi --no-plugins psalm/phar phpunit/phpunit:^9.5 php-http/discovery psr/event-dispatcher mongodb/mongodb jetbrains/phpstorm-stubs
 
       - name: Generate Psalm baseline
         run: |
diff --git a/src/Symfony/Component/Translation/LocaleSwitcher.php b/src/Symfony/Component/Translation/LocaleSwitcher.php
@@ -34,7 +34,10 @@ public function __construct(
 
     public function setLocale(string $locale): void
     {
-        \Locale::setDefault($this->locale = $locale);
+        if (class_exists(\Locale::class)) {
+            \Locale::setDefault($locale);
+        }
+        $this->locale = $locale;
         $this->requestContext?->setParameter('_locale', $locale);
 
         foreach ($this->localeAwareServices as $service) {
