Skip to content

Commit

Permalink
Merge branch '4.3' into 4.4
Browse files Browse the repository at this point in the history
* 4.3: (26 commits)
  Fix Twig 1.x compatibility
  [Translator] Improve farsi(persian) translations for Form
  Improve fa translations
  Spell "triggering" properly
  Added tests to cover the possibility of having scalars as services.
  fixed tests on old PHP versions
  [FrameworkBundle] Inform the user when save_path will be ignored
  fixed CS
  [SecurityBundle] Fix profiler dump for non-invokable security listeners
  fixed CS
  [Messenger] Doctrine Transport: Support setting auto_setup from DSN
  [Translator] Load plurals from po files properly
  [Serializer]: AbstractObjectNormalizer ignores the property types of discriminated classes
  [EventDispatcher] Add tag kernel.rest on 'debug.event_dispatcher' service
  [Console] Update to inherit and add licence
  Add missing test for workflow dump description
  [Intl] Remove --dev from intl compile autoloader
  [Messenger] fix publishing headers set on AmqpStamp
  Remove call to deprecated method
  [Intl] Init compile tmp volume
  ...
  • Loading branch information
nicolas-grekas committed Jul 10, 2019
2 parents acb8621 + 1478780 commit 8d67d15
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Resources/bin/autoload.php
Expand Up @@ -12,7 +12,7 @@
$autoload = __DIR__.'/../../vendor/autoload.php';

if (!file_exists($autoload)) {
bailout('You should run "composer install --dev" in the component before running this script.');
bailout('You should run "composer install" in the component before running this script.');
}

require_once $autoload;
5 changes: 2 additions & 3 deletions Resources/bin/compile
@@ -1,8 +1,7 @@
#!/usr/bin/env bash

if [[ $1 == force ]]; then
docker pull jakzal/php-intl
fi;
[[ $1 == force ]] && docker pull jakzal/php-intl
[[ ! -d /tmp/symfony/icu ]] && mkdir -p /tmp/symfony/icu

docker run \
-it --rm --name symfony-intl \
Expand Down

0 comments on commit 8d67d15

Please sign in to comment.