Skip to content

Commit e4d502c

Browse files
Merge branch '3.4'
* 3.4: [Yaml] Recommend using quotes instead of PARSE_KEYS_AS_STRINGS [DependencyInjection] Deprecate autowiring service auto-registration Removed useless argument $definition [DI] Generate shorter method names for class-based ids Fix comment [Config] Fix checking class existence freshness bumped Symfony version to 3.3.7 updated VERSION for 3.3.6 updated CHANGELOG for 3.3.6 Autoconfigure instances of ArgumentValueResolverInterface Deprecate Filesystem/LockHandler improve sql explain table display Bump minimal PHP version to ^5.5.9|>=7.0.8
2 parents 3b717aa + a1b56ef commit e4d502c

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

DependencyInjection/FormPass.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
1717
use Symfony\Component\DependencyInjection\ContainerBuilder;
1818
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
19-
use Symfony\Component\DependencyInjection\Definition;
2019
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
2120
use Symfony\Component\DependencyInjection\Reference;
2221

@@ -53,12 +52,12 @@ public function process(ContainerBuilder $container)
5352
if (new IteratorArgument(array()) != $definition->getArgument(2)) {
5453
return;
5554
}
56-
$definition->replaceArgument(0, $this->processFormTypes($container, $definition));
55+
$definition->replaceArgument(0, $this->processFormTypes($container));
5756
$definition->replaceArgument(1, $this->processFormTypeExtensions($container));
5857
$definition->replaceArgument(2, $this->processFormTypeGuessers($container));
5958
}
6059

61-
private function processFormTypes(ContainerBuilder $container, Definition $definition)
60+
private function processFormTypes(ContainerBuilder $container)
6261
{
6362
// Get service locator argument
6463
$servicesMap = array();

Extension/DataCollector/FormDataCollector.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ public function __construct(FormDataExtractorInterface $dataExtractor)
8686
*/
8787
public function collect(Request $request, Response $response, \Exception $exception = null)
8888
{
89-
if (70000 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70008) {
90-
@trigger_error('A bug in PHP 7.0.0 to 7.0.7 is breaking the Form panel, please upgrade to 7.0.8 or higher.', E_USER_DEPRECATED);
91-
}
9289
}
9390

9491
/**

0 commit comments

Comments
 (0)