diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Nicolas Grekas 2016-06-06 11:00:08 +02:00
parent 011d2dcd26
commit cb850fef26
10 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View File

@ -1268,7 +1268,7 @@ EOF;
return true; return true;
} }
if ($deep && !isset($visited[$argumentId]) && 'service_container' !== (string) $argument) { if ($deep && !isset($visited[$argumentId]) && 'service_container' !== $argumentId) {
$visited[$argumentId] = true; $visited[$argumentId] = true;
$service = $this->container->getDefinition($argumentId); $service = $this->container->getDefinition($argumentId);

8
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services13.php
View File

@ -36,6 +36,14 @@ class ProjectServiceContainer extends Container
$this->aliases = array(); $this->aliases = array();
} }
/**
* {@inheritdoc}
*/
public function compile()
{
throw new LogicException('You cannot compile a dumped frozen container.');
}
/** /**
* Gets the 'bar' service. * Gets the 'bar' service.
* *

2
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
View File

@ -461,7 +461,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
* @param mixed $val * @param mixed $val
* *
* @throws UnexpectedValueException * @throws UnexpectedValueException
* *
* @return bool * @return bool
*/ */
private function selectNodeType(\DOMNode $node, $val) private function selectNodeType(\DOMNode $node, $val)

6
src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
View File

@ -11,7 +11,7 @@
namespace Symfony\Component\Serializer\Normalizer; namespace Symfony\Component\Serializer\Normalizer;
use Symfony\Component\Serializer\Exception\Exception; use Symfony\Component\Serializer\Exception\ExceptionInterface;
/** /**
* Defines the most basic interface a class must implement to be denormalizable. * Defines the most basic interface a class must implement to be denormalizable.
@ -36,9 +36,9 @@ interface DenormalizableInterface
* based on different input formats * based on different input formats
* @param array $context options for denormalizing * @param array $context options for denormalizing
* *
* @return object * @throws ExceptionInterface
* *
* @throws Exception * @return object
*/ */
public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array()); public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array());
} }

6
src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
View File

@ -11,7 +11,7 @@
namespace Symfony\Component\Serializer\Normalizer; namespace Symfony\Component\Serializer\Normalizer;
use Symfony\Component\Serializer\Exception\Exception; use Symfony\Component\Serializer\Exception\ExceptionInterface;
/** /**
* Defines the interface of denormalizers. * Defines the interface of denormalizers.
@ -28,8 +28,8 @@ interface DenormalizerInterface
* @param string $format format the given data was extracted from * @param string $format format the given data was extracted from
* @param array $context options available to the denormalizer * @param array $context options available to the denormalizer
* *
* @throws Exception * @throws ExceptionInterface
* *
* @return object * @return object
*/ */
public function denormalize($data, $class, $format = null, array $context = array()); public function denormalize($data, $class, $format = null, array $context = array());

8
src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
View File

@ -11,7 +11,7 @@
namespace Symfony\Component\Serializer\Normalizer; namespace Symfony\Component\Serializer\Normalizer;
use Symfony\Component\Serializer\Exception\Exception; use Symfony\Component\Serializer\Exception\ExceptionInterface;
/** /**
* Defines the most basic interface a class must implement to be normalizable. * Defines the most basic interface a class must implement to be normalizable.
@ -35,9 +35,9 @@ interface NormalizableInterface
* based on different output formats. * based on different output formats.
* @param array $context Options for normalizing this object * @param array $context Options for normalizing this object
* *
* @throws Exception * @throws ExceptionInterface
* *
* @return array|string|bool|int|float|null * @return array|scalar
*/ */
public function normalize(NormalizerInterface $normalizer, $format = null, array $context = array()); public function normalize(NormalizerInterface $normalizer, $format = null, array $context = array());
} }

8
src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
View File

@ -11,7 +11,7 @@
namespace Symfony\Component\Serializer\Normalizer; namespace Symfony\Component\Serializer\Normalizer;
use Symfony\Component\Serializer\Exception\Exception; use Symfony\Component\Serializer\Exception\ExceptionInterface;
/** /**
* Defines the interface of normalizers. * Defines the interface of normalizers.
@ -27,9 +27,9 @@ interface NormalizerInterface
* @param string $format format the normalization result will be encoded as * @param string $format format the normalization result will be encoded as
* @param array $context Context options for the normalizer * @param array $context Context options for the normalizer
* *
* @throws Exception * @throws ExceptionInterface
* *
* @return array|string|bool|int|float|null * @return array|scalar
*/ */
public function normalize($object, $format = null, array $context = array()); public function normalize($object, $format = null, array $context = array());

4
src/Symfony/Component/Serializer/Serializer.php
View File

@ -183,8 +183,6 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz
* @param string $format format name, present to give the option to normalizers to act differently based on formats * @param string $format format name, present to give the option to normalizers to act differently based on formats
* *
* @return NormalizerInterface|null * @return NormalizerInterface|null
*
* @throws RuntimeException
*/ */
private function getNormalizer($data, $format) private function getNormalizer($data, $format)
{ {
@ -203,8 +201,6 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz
* @param string $format format name, present to give the option to normalizers to act differently based on formats * @param string $format format name, present to give the option to normalizers to act differently based on formats
* *
* @return DenormalizerInterface|null * @return DenormalizerInterface|null
*
* @throws RuntimeException
*/ */
private function getDenormalizer($data, $class, $format) private function getDenormalizer($data, $class, $format)
{ {

10
src/Symfony/Component/Serializer/SerializerInterface.php
View File

@ -11,7 +11,7 @@
namespace Symfony\Component\Serializer; namespace Symfony\Component\Serializer;
use Symfony\Component\Serializer\Exception\Exception; use Symfony\Component\Serializer\Exception\ExceptionInterface;
/** /**
* Defines the interface of the Serializer. * Defines the interface of the Serializer.
@ -27,8 +27,8 @@ interface SerializerInterface
* @param string $format format name * @param string $format format name
* @param array $context options normalizers/encoders have access to * @param array $context options normalizers/encoders have access to
* *
* @throws Exception * @throws ExceptionInterface
* *
* @return string * @return string
*/ */
public function serialize($data, $format, array $context = array()); public function serialize($data, $format, array $context = array());
@ -41,8 +41,8 @@ interface SerializerInterface
* @param string $format * @param string $format
* @param array $context * @param array $context
* *
* @throws Exception * @throws ExceptionInterface
* *
* @return object * @return object
*/ */
public function deserialize($data, $type, $format, array $context = array()); public function deserialize($data, $type, $format, array $context = array());

2
src/Symfony/Component/Yaml/Tests/InlineTest.php
View File

@ -398,8 +398,6 @@ class InlineTest extends \PHPUnit_Framework_TestCase
array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')), array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
array('{ foo: { bar: { 1: 2, baz: 3 } } }', array('foo' => array('bar' => array(1 => 2, 'baz' => 3)))), array('{ foo: { bar: { 1: 2, baz: 3 } } }', array('foo' => array('bar' => array(1 => 2, 'baz' => 3)))),
); );
} }