Merge branch '3.4' into 4.4
* 3.4: [FrameworkBundle] display actual target for error in AssetsInstallCommand Remove patches for Doctrine bugs and deprecations [DI][EventDispatcher] added contract for implementation
This commit is contained in:
commit
2dbfeb9db9
|
@ -84,7 +84,6 @@ jobs:
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: ./phpunit --verbose --group integration
|
run: ./phpunit --verbose --group integration
|
||||||
env:
|
env:
|
||||||
SYMFONY_DEPRECATIONS_HELPER: 'max[indirect]=7'
|
|
||||||
REDIS_HOST: localhost
|
REDIS_HOST: localhost
|
||||||
REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
|
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
|
MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
|
||||||
|
|
|
@ -103,7 +103,7 @@
|
||||||
"doctrine/cache": "~1.6",
|
"doctrine/cache": "~1.6",
|
||||||
"doctrine/collections": "~1.0",
|
"doctrine/collections": "~1.0",
|
||||||
"doctrine/data-fixtures": "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/orm": "~2.4,>=2.4.5",
|
||||||
"doctrine/reflection": "~1.0",
|
"doctrine/reflection": "~1.0",
|
||||||
"doctrine/doctrine-bundle": "^1.5|^2.0",
|
"doctrine/doctrine-bundle": "^1.5|^2.0",
|
||||||
|
|
10
phpunit
10
phpunit
|
@ -21,14 +21,4 @@ if (!getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
|
||||||
putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
|
putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=deprecations=1');
|
||||||
}
|
}
|
||||||
putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
|
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';
|
require __DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
"doctrine/cache": "~1.6",
|
"doctrine/cache": "~1.6",
|
||||||
"doctrine/collections": "~1.0",
|
"doctrine/collections": "~1.0",
|
||||||
"doctrine/data-fixtures": "1.0.*",
|
"doctrine/data-fixtures": "1.0.*",
|
||||||
"doctrine/dbal": "~2.4,<=2.10.2",
|
"doctrine/dbal": "~2.4",
|
||||||
"doctrine/orm": "^2.6.3",
|
"doctrine/orm": "^2.6.3",
|
||||||
"doctrine/reflection": "~1.0"
|
"doctrine/reflection": "~1.0"
|
||||||
},
|
},
|
||||||
|
|
|
@ -109,7 +109,7 @@ EOT
|
||||||
$targetArg = $kernel->getProjectDir().'/'.$targetArg;
|
$targetArg = $kernel->getProjectDir().'/'.$targetArg;
|
||||||
|
|
||||||
if (!is_dir($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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,9 @@ interface EventSubscriberInterface
|
||||||
* * ['eventName' => ['methodName', $priority]]
|
* * ['eventName' => ['methodName', $priority]]
|
||||||
* * ['eventName' => [['methodName1', $priority], ['methodName2']]]
|
* * ['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
|
* @return array The event names to listen to
|
||||||
*/
|
*/
|
||||||
public static function getSubscribedEvents();
|
public static function getSubscribedEvents();
|
||||||
|
|
Reference in New Issue