Skip to content

Commit

Permalink
Merge branch '3.4' into 4.4
Browse files Browse the repository at this point in the history
* 3.4:
  [FrameworkBundle] display actual target for error in AssetsInstallCommand
  Remove patches for Doctrine bugs and deprecations
  [DI][EventDispatcher] added contract for implementation
  • Loading branch information
nicolas-grekas committed May 8, 2020
2 parents 5c24718 + f6ae18e commit 2dbfeb9
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 14 deletions.
1 change: 0 additions & 1 deletion .github/workflows/tests.yml
Expand Up @@ -84,7 +84,6 @@ jobs:
- name: Run tests
run: ./phpunit --verbose --group integration
env:
SYMFONY_DEPRECATIONS_HELPER: 'max[indirect]=7'
REDIS_HOST: localhost
REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -103,7 +103,7 @@
"doctrine/cache": "~1.6",
"doctrine/collections": "~1.0",
"doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": "~2.4,<=2.10.2",
"doctrine/dbal": "~2.4",
"doctrine/orm": "~2.4,>=2.4.5",
"doctrine/reflection": "~1.0",
"doctrine/doctrine-bundle": "^1.5|^2.0",
Expand Down
10 changes: 0 additions & 10 deletions phpunit
Expand Up @@ -21,14 +21,4 @@ if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
}
putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');

if (!getenv('SYMFONY_DEPRECATIONS_HELPER')) {
foreach ($_SERVER['argv'] as $v) {
if (false !== strpos($v, 'Bridge/Doctrine')) {
putenv('SYMFONY_DEPRECATIONS_HELPER=max[indirect]=7');
break;
}
}
}

require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Doctrine/composer.json
Expand Up @@ -42,7 +42,7 @@
"doctrine/cache": "~1.6",
"doctrine/collections": "~1.0",
"doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": "~2.4,<=2.10.2",
"doctrine/dbal": "~2.4",
"doctrine/orm": "^2.6.3",
"doctrine/reflection": "~1.0"
},
Expand Down
Expand Up @@ -109,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$targetArg = $kernel->getProjectDir().'/'.$targetArg;

if (!is_dir($targetArg)) {
throw new InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $input->getArgument('target')));
throw new InvalidArgumentException(sprintf('The target directory "%s" does not exist.', $targetArg));
}
}

Expand Down
Expand Up @@ -40,6 +40,9 @@ interface EventSubscriberInterface
* * ['eventName' => ['methodName', $priority]]
* * ['eventName' => [['methodName1', $priority], ['methodName2']]]
*
* The code must not depend on runtime state as it will only be called at compile time.
* All logic depending on runtime state must be put into the individual methods handling the events.
*
* @return array The event names to listen to
*/
public static function getSubscribedEvents();
Expand Down

0 comments on commit 2dbfeb9

Please sign in to comment.