8000 Merge branch '5.4' into 6.0 · symfony/symfony@11abf7c · GitHub
[go: up one dir, main page]
Skip to content

Commit 11abf7c

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.0
* 5.4: [ErrorHandler] improve parsing of phpdoc by DebugClassLoader
2 parents 447178f + 7347f98 commit 11abf7c

File tree

6 files changed

+2055
-216
lines changed

6 files changed

+2055
-216
lines changed

‎.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
uses: shivammathur/setup-php@v2
123123
with:
124124
coverage: "none"
125-
extensions: "json,couchbase,memcached,mongodb,redis,rdkafka,xsl,ldap"
125+
extensions: "json,couchbase,memcached,mongodb-1.10.0,redis,rdkafka,xsl,ldap"
126126
ini-values: date.timezone=Europe/Paris,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
127127
php-version: "${{ matrix.php }}"
128128
tools: pecl
@@ -146,7 +146,7 @@ jobs:
146146
echo COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION >> $GITHUB_ENV
147147
148148
echo "::group::composer update"
149-
composer require --dev --no-update mongodb/mongodb:@stable
149+
composer require --dev --no-update mongodb/mongodb:"1.9.1@dev|^1.9.1@stable"
150150
composer update --no-progress --ansi
151151
echo "::endgroup::"
152152

0 commit comments

Comments
 (0)
0