Skip to content

Commit a1b56ef

Browse files
Merge branch '3.3' into 3.4
* 3.3: Removed useless argument $definition 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 Bump minimal PHP version to ^5.5.9|>=7.0.8
2 parents 9d4d1c4 + 36f2059 commit a1b56ef

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
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
@@ -85,9 +85,6 @@ public function __construct(FormDataExtractorInterface $dataExtractor)
8585
*/
8686
public function collect(Request $request, Response $response, \Exception $exception = null)
8787
{
88-
if (70000 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70008) {
89-
@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);
90-
}
9188
}
9289

9390
/**

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.5.9",
19+
"php": "^5.5.9|>=7.0.8",
2020
"symfony/event-dispatcher": "~2.8|~3.0|~4.0",
2121
"symfony/intl": "^2.8.18|^3.2.5|~4.0",
2222
"symfony/options-resolver": "~2.8|~3.0|~4.0",

0 commit comments

Comments
 (0)