Merge branch '3.3' into 3.4
* 3.3: [Serializer] Remove a useless legacy annotation Fixed extra semi-colon fix docblock position [DependencyInjection] remove unused variable [PhpUnitBridge] add changelog entries for #21140 [DI] Remove dead service_container checks
This commit is contained in:
commit
98a2d3c429
10
src/Symfony/Bridge/PhpUnit/CHANGELOG.md
Normal file
10
src/Symfony/Bridge/PhpUnit/CHANGELOG.md
Normal file
@ -0,0 +1,10 @@
|
||||
CHANGELOG
|
||||
=========
|
||||
|
||||
3.3.0
|
||||
-----
|
||||
|
||||
* using the `testLegacy` prefix in method names to mark a test as legacy is
|
||||
deprecated, use the `@group legacy` notation instead
|
||||
* using the `Legacy` prefix in class names to mark a test as legacy is deprecated,
|
||||
use the `@group legacy` notation instead
|
@ -258,10 +258,6 @@ abstract class Descriptor implements DescriptorInterface
|
||||
return $builder->getAlias($serviceId);
|
||||
}
|
||||
|
||||
if ('service_container' === $serviceId) {
|
||||
return $builder;
|
||||
}
|
||||
|
||||
// the service has been injected in some special way, just return the service
|
||||
return $builder->get($serviceId);
|
||||
}
|
||||
|
@ -48,10 +48,11 @@ class Translator extends BaseTranslator implements WarmableInterface
|
||||
* * debug: Whether to enable debugging or not (false by default)
|
||||
* * resource_files: List of translation resources available grouped by locale.
|
||||
*
|
||||
* @param ContainerInterface $container A ContainerInterface instance
|
||||
* @param MessageSelector $selector The message selector for pluralization
|
||||
* @param array $loaderIds An array of loader Ids
|
||||
* @param array $options An array of options
|
||||
* @param ContainerInterface $container A ContainerInterface instance
|
||||
* @param MessageSelector $selector The message selector for pluralization
|
||||
* @param string $defaultLocale
|
||||
* @param array $loaderIds An array of loader Ids
|
||||
* @param array $options An array of options
|
||||
*
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
|
@ -163,7 +163,6 @@ class AutowirePass extends AbstractRecursivePass
|
||||
*/
|
||||
private function getMethodsToAutowire(\ReflectionClass $reflectionClass)
|
||||
{
|
||||
$found = array();
|
||||
$methodsToAutowire = array();
|
||||
|
||||
foreach ($reflectionClass->getMethods() as $reflectionMethod) {
|
||||
|
@ -192,8 +192,7 @@ class GraphvizDumper extends Dumper
|
||||
}
|
||||
|
||||
if (!$container->hasDefinition($id)) {
|
||||
$class = get_class('service_container' === $id ? $this->container : $container->get($id));
|
||||
$nodes[$id] = array('class' => str_replace('\\', '\\\\', $class), 'attributes' => $this->options['node.instance']);
|
||||
$nodes[$id] = array('class' => str_replace('\\', '\\\\', get_class($container->get($id))), 'attributes' => $this->options['node.instance']);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -26,9 +26,6 @@ class AbstractObjectNormalizerTest extends TestCase
|
||||
$this->assertSame('baz', $normalizedData->baz);
|
||||
}
|
||||
|
||||
/**
|
||||
* @group legacy
|
||||
*/
|
||||
public function testInstantiateObjectDenormalizer()
|
||||
{
|
||||
$data = array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz');
|
||||
|
@ -74,11 +74,10 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
|
||||
/**
|
||||
* Constructor.
|
||||
*
|
||||
* @param string $locale The locale
|
||||
* @param MessageSelector|null $selector The message selector for pluralization
|
||||
* @param string $defaultLocale
|
||||
* @param string|null $cacheDir The directory to use for the cache
|
||||
* @param bool $debug Use cache in debug mode ?
|
||||
* @param string $locale The locale
|
||||
* @param MessageSelector|null $selector The message selector for pluralization
|
||||
* @param string|null $cacheDir The directory to use for the cache
|
||||
* @param bool $debug Use cache in debug mode ?
|
||||
*
|
||||
* @throws InvalidArgumentException If a locale contains invalid characters
|
||||
*/
|
||||
|
@ -51,7 +51,6 @@ class ReflectionCaster
|
||||
unset($v->value['position'], $v->value['isVariadic'], $v->value['byReference'], $v);
|
||||
}
|
||||
}
|
||||
;
|
||||
|
||||
if (!($filter & Caster::EXCLUDE_VERBOSE) && $f = $c->getFileName()) {
|
||||
$a[$prefix.'file'] = new LinkStub($f, $c->getStartLine());
|
||||
|
Reference in New Issue
Block a user