Skip to content

Commit 097963f

Browse files
Merge branch '3.4' into 4.1
* 3.4: [VarDumper] fix dump of closures created from callables [DI] fix dumping inlined services Add framework asset changes to upgrade 3.0 guide [Travis] Bump ext-mongodb to 1.5.2 on Travis [DI] dont track classes/interfaces used to compute autowiring error messages [DI] fix GraphvizDumper ignoring inline definitions bumped Symfony version to 3.4.19 updated VERSION for 3.4.18 updated CHANGELOG for 3.4.18 bumped Symfony version to 2.8.48 updated VERSION for 2.8.47 update CONTRIBUTORS for 2.8.47 updated CHANGELOG for 2.8.47 Fix ini_get() for boolean values
2 parents 0615759 + 6006448 commit 097963f

File tree

51 files changed

+494
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+494
-185
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ before_install:
160160
fi
161161
162162
tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
163-
tfold ext.mongodb tpecl mongodb-1.5.0 mongodb.so $INI
163+
tfold ext.mongodb tpecl mongodb-1.5.2 mongodb.so $INI
164164
tfold ext.amqp tpecl amqp-1.9.3 amqp.so $INI
165165
done
166166
@@ -223,7 +223,7 @@ install:
223223
break
224224
fi
225225
phpenv global $PHP
226-
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer require --dev --no-update mongodb/mongodb)
226+
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.5.2; composer require --dev --no-update mongodb/mongodb)
227227
tfold 'composer update' $COMPOSER_UP
228228
tfold 'phpunit install' ./phpunit install
229229
if [[ $deps = high ]]; then

0 commit comments

Comments
 (0)