Merge branch '3.4' into 4.3
* 3.4: Fix return statements [TwigBridge] add missing dep Add false type to ChoiceListFactoryInterface::createView $label argument
This commit is contained in:
commit
7d0795d0b8
@ -91,7 +91,7 @@ class IdReader
|
|||||||
public function getIdValue($object)
|
public function getIdValue($object)
|
||||||
{
|
{
|
||||||
if (!$object) {
|
if (!$object) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->om->contains($object)) {
|
if (!$this->om->contains($object)) {
|
||||||
|
@ -99,7 +99,7 @@ class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
|
|||||||
$classMetadatas = $this->getMetadata($class);
|
$classMetadatas = $this->getMetadata($class);
|
||||||
|
|
||||||
if (!$classMetadatas) {
|
if (!$classMetadatas) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @var ClassMetadataInfo $classMetadata */
|
/** @var ClassMetadataInfo $classMetadata */
|
||||||
|
@ -68,7 +68,7 @@ class AppVariable
|
|||||||
/**
|
/**
|
||||||
* Returns the current user.
|
* Returns the current user.
|
||||||
*
|
*
|
||||||
* @return mixed
|
* @return object|null
|
||||||
*
|
*
|
||||||
* @see TokenInterface::getUser()
|
* @see TokenInterface::getUser()
|
||||||
*/
|
*/
|
||||||
@ -79,7 +79,7 @@ class AppVariable
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!$token = $tokenStorage->getToken()) {
|
if (!$token = $tokenStorage->getToken()) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$user = $token->getUser();
|
$user = $token->getUser();
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"egulias/email-validator": "^2.0",
|
"egulias/email-validator": "^2.0",
|
||||||
|
"fig/link-util": "^1.0",
|
||||||
"symfony/asset": "~3.4|~4.0",
|
"symfony/asset": "~3.4|~4.0",
|
||||||
"symfony/dependency-injection": "~3.4|~4.0",
|
"symfony/dependency-injection": "~3.4|~4.0",
|
||||||
"symfony/finder": "~3.4|~4.0",
|
"symfony/finder": "~3.4|~4.0",
|
||||||
|
@ -351,7 +351,7 @@ trait ControllerTrait
|
|||||||
/**
|
/**
|
||||||
* Get a user from the Security Token Storage.
|
* Get a user from the Security Token Storage.
|
||||||
*
|
*
|
||||||
* @return mixed
|
* @return object|null
|
||||||
*
|
*
|
||||||
* @throws \LogicException If SecurityBundle is not available
|
* @throws \LogicException If SecurityBundle is not available
|
||||||
*
|
*
|
||||||
@ -366,12 +366,12 @@ trait ControllerTrait
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (null === $token = $this->container->get('security.token_storage')->getToken()) {
|
if (null === $token = $this->container->get('security.token_storage')->getToken()) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!\is_object($user = $token->getUser())) {
|
if (!\is_object($user = $token->getUser())) {
|
||||||
// e.g. anonymous authentication
|
// e.g. anonymous authentication
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $user;
|
return $user;
|
||||||
|
@ -40,7 +40,7 @@ class GlobalVariables
|
|||||||
public function getToken()
|
public function getToken()
|
||||||
{
|
{
|
||||||
if (!$this->container->has('security.token_storage')) {
|
if (!$this->container->has('security.token_storage')) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->container->get('security.token_storage')->getToken();
|
return $this->container->get('security.token_storage')->getToken();
|
||||||
|
@ -126,7 +126,7 @@ class CodeHelper extends Helper
|
|||||||
|
|
||||||
// Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files
|
// Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files
|
||||||
if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {
|
if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {
|
||||||
return;
|
return '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -533,7 +533,7 @@ abstract class Client
|
|||||||
protected function createCrawlerFromContent($uri, $content, $type)
|
protected function createCrawlerFromContent($uri, $content, $type)
|
||||||
{
|
{
|
||||||
if (!class_exists('Symfony\Component\DomCrawler\Crawler')) {
|
if (!class_exists('Symfony\Component\DomCrawler\Crawler')) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$crawler = new Crawler(null, $uri);
|
$crawler = new Crawler(null, $uri);
|
||||||
|
@ -219,7 +219,7 @@ class XmlUtils
|
|||||||
|
|
||||||
switch (true) {
|
switch (true) {
|
||||||
case 'null' === $lowercaseValue:
|
case 'null' === $lowercaseValue:
|
||||||
return;
|
return null;
|
||||||
case ctype_digit($value):
|
case ctype_digit($value):
|
||||||
$raw = $value;
|
$raw = $value;
|
||||||
$cast = (int) $value;
|
$cast = (int) $value;
|
||||||
|
@ -472,7 +472,7 @@ class Application
|
|||||||
if (!$command->isEnabled()) {
|
if (!$command->isEnabled()) {
|
||||||
$command->setApplication(null);
|
$command->setApplication(null);
|
||||||
|
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (null === $command->getDefinition()) {
|
if (null === $command->getDefinition()) {
|
||||||
|
@ -155,7 +155,7 @@ class TokenStream
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($next->isDelimiter(['*'])) {
|
if ($next->isDelimiter(['*'])) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
throw SyntaxErrorException::unexpectedToken('identifier or "*"', $next);
|
throw SyntaxErrorException::unexpectedToken('identifier or "*"', $next);
|
||||||
|
@ -443,7 +443,7 @@ class ErrorHandler
|
|||||||
self::$silencedErrorCache[$id][$message] = $errorAsException;
|
self::$silencedErrorCache[$id][$message] = $errorAsException;
|
||||||
}
|
}
|
||||||
if (null === $lightTrace) {
|
if (null === $lightTrace) {
|
||||||
return;
|
return true;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
|
$errorAsException = new \ErrorException($logMessage, 0, $type, $file, $line);
|
||||||
|
@ -33,11 +33,11 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
|
|||||||
$notFoundSuffix = '\' not found';
|
$notFoundSuffix = '\' not found';
|
||||||
$notFoundSuffixLen = \strlen($notFoundSuffix);
|
$notFoundSuffixLen = \strlen($notFoundSuffix);
|
||||||
if ($notFoundSuffixLen > $messageLen) {
|
if ($notFoundSuffixLen > $messageLen) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (0 !== substr_compare($error['message'], $notFoundSuffix, -$notFoundSuffixLen)) {
|
if (0 !== substr_compare($error['message'], $notFoundSuffix, -$notFoundSuffixLen)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (['class', 'interface', 'trait'] as $typeName) {
|
foreach (['class', 'interface', 'trait'] as $typeName) {
|
||||||
|
@ -30,17 +30,17 @@ class UndefinedFunctionFatalErrorHandler implements FatalErrorHandlerInterface
|
|||||||
$notFoundSuffix = '()';
|
$notFoundSuffix = '()';
|
||||||
$notFoundSuffixLen = \strlen($notFoundSuffix);
|
$notFoundSuffixLen = \strlen($notFoundSuffix);
|
||||||
if ($notFoundSuffixLen > $messageLen) {
|
if ($notFoundSuffixLen > $messageLen) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (0 !== substr_compare($error['message'], $notFoundSuffix, -$notFoundSuffixLen)) {
|
if (0 !== substr_compare($error['message'], $notFoundSuffix, -$notFoundSuffixLen)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$prefix = 'Call to undefined function ';
|
$prefix = 'Call to undefined function ';
|
||||||
$prefixLen = \strlen($prefix);
|
$prefixLen = \strlen($prefix);
|
||||||
if (0 !== strpos($error['message'], $prefix)) {
|
if (0 !== strpos($error['message'], $prefix)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$fullyQualifiedFunctionName = substr($error['message'], $prefixLen, -$notFoundSuffixLen);
|
$fullyQualifiedFunctionName = substr($error['message'], $prefixLen, -$notFoundSuffixLen);
|
||||||
|
@ -28,7 +28,7 @@ class UndefinedMethodFatalErrorHandler implements FatalErrorHandlerInterface
|
|||||||
{
|
{
|
||||||
preg_match('/^Call to undefined method (.*)::(.*)\(\)$/', $error['message'], $matches);
|
preg_match('/^Call to undefined method (.*)::(.*)\(\)$/', $error['message'], $matches);
|
||||||
if (!$matches) {
|
if (!$matches) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$className = $matches[1];
|
$className = $matches[1];
|
||||||
|
@ -29,7 +29,7 @@ class ProxyHelper
|
|||||||
$type = $r->getReturnType();
|
$type = $r->getReturnType();
|
||||||
}
|
}
|
||||||
if (!$type) {
|
if (!$type) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
if (!\is_string($type)) {
|
if (!\is_string($type)) {
|
||||||
$name = $type->getName();
|
$name = $type->getName();
|
||||||
@ -45,7 +45,7 @@ class ProxyHelper
|
|||||||
return $prefix.$name;
|
return $prefix.$name;
|
||||||
}
|
}
|
||||||
if (!$r instanceof \ReflectionMethod) {
|
if (!$r instanceof \ReflectionMethod) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
if ('self' === $lcName) {
|
if ('self' === $lcName) {
|
||||||
return $prefix.$r->getDeclaringClass()->name;
|
return $prefix.$r->getDeclaringClass()->name;
|
||||||
|
@ -414,12 +414,12 @@ class Filesystem
|
|||||||
public function readlink($path, $canonicalize = false)
|
public function readlink($path, $canonicalize = false)
|
||||||
{
|
{
|
||||||
if (!$canonicalize && !is_link($path)) {
|
if (!$canonicalize && !is_link($path)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($canonicalize) {
|
if ($canonicalize) {
|
||||||
if (!$this->exists($path)) {
|
if (!$this->exists($path)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ('\\' === \DIRECTORY_SEPARATOR) {
|
if ('\\' === \DIRECTORY_SEPARATOR) {
|
||||||
|
@ -78,14 +78,11 @@ interface ChoiceListFactoryInterface
|
|||||||
* attributes that should be added to the respective choice.
|
* attributes that should be added to the respective choice.
|
||||||
*
|
*
|
||||||
* @param array|callable|null $preferredChoices The preferred choices
|
* @param array|callable|null $preferredChoices The preferred choices
|
||||||
* @param callable|null $label The callable generating the
|
* @param callable|false|null $label The callable generating the choice labels;
|
||||||
* choice labels
|
* pass false to discard the label
|
||||||
* @param callable|null $index The callable generating the
|
* @param callable|null $index The callable generating the view indices
|
||||||
* view indices
|
* @param callable|null $groupBy The callable generating the group names
|
||||||
* @param callable|null $groupBy The callable generating the
|
* @param array|callable|null $attr The callable generating the HTML attributes
|
||||||
* group names
|
|
||||||
* @param array|callable|null $attr The callable generating the
|
|
||||||
* HTML attributes
|
|
||||||
*
|
*
|
||||||
* @return ChoiceListView The choice list view
|
* @return ChoiceListView The choice list view
|
||||||
*/
|
*/
|
||||||
|
@ -45,14 +45,14 @@ class BooleanToStringTransformer implements DataTransformerInterface
|
|||||||
*
|
*
|
||||||
* @param bool $value Boolean value
|
* @param bool $value Boolean value
|
||||||
*
|
*
|
||||||
* @return string String value
|
* @return string|null String value
|
||||||
*
|
*
|
||||||
* @throws TransformationFailedException if the given value is not a Boolean
|
* @throws TransformationFailedException if the given value is not a Boolean
|
||||||
*/
|
*/
|
||||||
public function transform($value)
|
public function transform($value)
|
||||||
{
|
{
|
||||||
if (null === $value) {
|
if (null === $value) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!\is_bool($value)) {
|
if (!\is_bool($value)) {
|
||||||
|
@ -106,7 +106,7 @@ class DateIntervalToArrayTransformer implements DataTransformerInterface
|
|||||||
*
|
*
|
||||||
* @param array $value Interval array
|
* @param array $value Interval array
|
||||||
*
|
*
|
||||||
* @return \DateInterval Normalized date interval
|
* @return \DateInterval|null Normalized date interval
|
||||||
*
|
*
|
||||||
* @throws UnexpectedTypeException if the given value is not an array
|
* @throws UnexpectedTypeException if the given value is not an array
|
||||||
* @throws TransformationFailedException if the value could not be transformed
|
* @throws TransformationFailedException if the value could not be transformed
|
||||||
@ -114,13 +114,13 @@ class DateIntervalToArrayTransformer implements DataTransformerInterface
|
|||||||
public function reverseTransform($value)
|
public function reverseTransform($value)
|
||||||
{
|
{
|
||||||
if (null === $value) {
|
if (null === $value) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
if (!\is_array($value)) {
|
if (!\is_array($value)) {
|
||||||
throw new UnexpectedTypeException($value, 'array');
|
throw new UnexpectedTypeException($value, 'array');
|
||||||
}
|
}
|
||||||
if ('' === implode('', $value)) {
|
if ('' === implode('', $value)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
$emptyFields = [];
|
$emptyFields = [];
|
||||||
foreach ($this->fields as $field) {
|
foreach ($this->fields as $field) {
|
||||||
|
@ -62,7 +62,7 @@ class DateIntervalToStringTransformer implements DataTransformerInterface
|
|||||||
*
|
*
|
||||||
* @param string $value An ISO 8601 or date string like date interval presentation
|
* @param string $value An ISO 8601 or date string like date interval presentation
|
||||||
*
|
*
|
||||||
* @return \DateInterval An instance of \DateInterval
|
* @return \DateInterval|null An instance of \DateInterval
|
||||||
*
|
*
|
||||||
* @throws UnexpectedTypeException if the given value is not a string
|
* @throws UnexpectedTypeException if the given value is not a string
|
||||||
* @throws TransformationFailedException if the date interval could not be parsed
|
* @throws TransformationFailedException if the date interval could not be parsed
|
||||||
@ -70,13 +70,13 @@ class DateIntervalToStringTransformer implements DataTransformerInterface
|
|||||||
public function reverseTransform($value)
|
public function reverseTransform($value)
|
||||||
{
|
{
|
||||||
if (null === $value) {
|
if (null === $value) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
if (!\is_string($value)) {
|
if (!\is_string($value)) {
|
||||||
throw new UnexpectedTypeException($value, 'string');
|
throw new UnexpectedTypeException($value, 'string');
|
||||||
}
|
}
|
||||||
if ('' === $value) {
|
if ('' === $value) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
if (!$this->isISO8601($value)) {
|
if (!$this->isISO8601($value)) {
|
||||||
throw new TransformationFailedException('Non ISO 8601 date strings are not supported yet');
|
throw new TransformationFailedException('Non ISO 8601 date strings are not supported yet');
|
||||||
|
@ -103,7 +103,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
|
|||||||
*
|
*
|
||||||
* @param array $value Localized date
|
* @param array $value Localized date
|
||||||
*
|
*
|
||||||
* @return \DateTime Normalized date
|
* @return \DateTime|null Normalized date
|
||||||
*
|
*
|
||||||
* @throws TransformationFailedException If the given value is not an array,
|
* @throws TransformationFailedException If the given value is not an array,
|
||||||
* if the value could not be transformed
|
* if the value could not be transformed
|
||||||
@ -111,7 +111,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
|
|||||||
public function reverseTransform($value)
|
public function reverseTransform($value)
|
||||||
{
|
{
|
||||||
if (null === $value) {
|
if (null === $value) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!\is_array($value)) {
|
if (!\is_array($value)) {
|
||||||
@ -119,7 +119,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ('' === implode('', $value)) {
|
if ('' === implode('', $value)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$emptyFields = [];
|
$emptyFields = [];
|
||||||
|
@ -66,7 +66,7 @@ class DateTimeToHtml5LocalDateTimeTransformer extends BaseDateTimeTransformer
|
|||||||
*
|
*
|
||||||
* @param string $dateTimeLocal Formatted string
|
* @param string $dateTimeLocal Formatted string
|
||||||
*
|
*
|
||||||
* @return \DateTime Normalized date
|
* @return \DateTime|null Normalized date
|
||||||
*
|
*
|
||||||
* @throws TransformationFailedException If the given value is not a string,
|
* @throws TransformationFailedException If the given value is not a string,
|
||||||
* if the value could not be transformed
|
* if the value could not be transformed
|
||||||
@ -78,7 +78,7 @@ class DateTimeToHtml5LocalDateTimeTransformer extends BaseDateTimeTransformer
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ('' === $dateTimeLocal) {
|
if ('' === $dateTimeLocal) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// to maintain backwards compatibility we do not strictly validate the submitted date
|
// to maintain backwards compatibility we do not strictly validate the submitted date
|
||||||
|
@ -99,7 +99,7 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
|
|||||||
*
|
*
|
||||||
* @param string|array $value Localized date string/array
|
* @param string|array $value Localized date string/array
|
||||||
*
|
*
|
||||||
* @return \DateTime Normalized date
|
* @return \DateTime|null Normalized date
|
||||||
*
|
*
|
||||||
* @throws TransformationFailedException if the given value is not a string,
|
* @throws TransformationFailedException if the given value is not a string,
|
||||||
* if the date could not be parsed
|
* if the date could not be parsed
|
||||||
@ -111,7 +111,7 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ('' === $value) {
|
if ('' === $value) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// date-only patterns require parsing to be done in UTC, as midnight might not exist in the local timezone due
|
// date-only patterns require parsing to be done in UTC, as midnight might not exist in the local timezone due
|
||||||
|
@ -53,7 +53,7 @@ class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer
|
|||||||
*
|
*
|
||||||
* @param string $rfc3339 Formatted string
|
* @param string $rfc3339 Formatted string
|
||||||
*
|
*
|
||||||
* @return \DateTime Normalized date
|
* @return \DateTime|null Normalized date
|
||||||
*
|
*
|
||||||
* @throws TransformationFailedException If the given value is not a string,
|
* @throws TransformationFailedException If the given value is not a string,
|
||||||
* if the value could not be transformed
|
* if the value could not be transformed
|
||||||
@ -65,7 +65,7 @@ class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ('' === $rfc3339) {
|
if ('' === $rfc3339) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!preg_match('/^(\d{4})-(\d{2})-(\d{2})T\d{2}:\d{2}(?::\d{2})?(?:\.\d+)?(?:Z|(?:(?:\+|-)\d{2}:\d{2}))$/', $rfc3339, $matches)) {
|
if (!preg_match('/^(\d{4})-(\d{2})-(\d{2})T\d{2}:\d{2}(?::\d{2})?(?:\.\d+)?(?:Z|(?:(?:\+|-)\d{2}:\d{2}))$/', $rfc3339, $matches)) {
|
||||||
|
@ -101,7 +101,7 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer
|
|||||||
*
|
*
|
||||||
* @param string $value A value as produced by PHP's date() function
|
* @param string $value A value as produced by PHP's date() function
|
||||||
*
|
*
|
||||||
* @return \DateTime An instance of \DateTime
|
* @return \DateTime|null An instance of \DateTime
|
||||||
*
|
*
|
||||||
* @throws TransformationFailedException If the given value is not a string,
|
* @throws TransformationFailedException If the given value is not a string,
|
||||||
* or could not be transformed
|
* or could not be transformed
|
||||||
@ -109,7 +109,7 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer
|
|||||||
public function reverseTransform($value)
|
public function reverseTransform($value)
|
||||||
{
|
{
|
||||||
if (empty($value)) {
|
if (empty($value)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!\is_string($value)) {
|
if (!\is_string($value)) {
|
||||||
|
@ -26,14 +26,14 @@ class DateTimeToTimestampTransformer extends BaseDateTimeTransformer
|
|||||||
*
|
*
|
||||||
* @param \DateTimeInterface $dateTime A DateTimeInterface object
|
* @param \DateTimeInterface $dateTime A DateTimeInterface object
|
||||||
*
|
*
|
||||||
* @return int A timestamp
|
* @return int|null A timestamp
|
||||||
*
|
*
|
||||||
* @throws TransformationFailedException If the given value is not a \DateTimeInterface
|
* @throws TransformationFailedException If the given value is not a \DateTimeInterface
|
||||||
*/
|
*/
|
||||||
public function transform($dateTime)
|
public function transform($dateTime)
|
||||||
{
|
{
|
||||||
if (null === $dateTime) {
|
if (null === $dateTime) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$dateTime instanceof \DateTimeInterface) {
|
if (!$dateTime instanceof \DateTimeInterface) {
|
||||||
@ -48,7 +48,7 @@ class DateTimeToTimestampTransformer extends BaseDateTimeTransformer
|
|||||||
*
|
*
|
||||||
* @param string $value A timestamp
|
* @param string $value A timestamp
|
||||||
*
|
*
|
||||||
* @return \DateTime A \DateTime object
|
* @return \DateTime|null A \DateTime object
|
||||||
*
|
*
|
||||||
* @throws TransformationFailedException If the given value is not a timestamp
|
* @throws TransformationFailedException If the given value is not a timestamp
|
||||||
* or if the given timestamp is invalid
|
* or if the given timestamp is invalid
|
||||||
@ -56,7 +56,7 @@ class DateTimeToTimestampTransformer extends BaseDateTimeTransformer
|
|||||||
public function reverseTransform($value)
|
public function reverseTransform($value)
|
||||||
{
|
{
|
||||||
if (null === $value) {
|
if (null === $value) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_numeric($value)) {
|
if (!is_numeric($value)) {
|
||||||
|
@ -145,7 +145,7 @@ class NumberToLocalizedStringTransformer implements DataTransformerInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ('' === $value) {
|
if ('' === $value) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (\in_array($value, ['NaN', 'NAN', 'nan'], true)) {
|
if (\in_array($value, ['NaN', 'NAN', 'nan'], true)) {
|
||||||
|
@ -112,7 +112,7 @@ class PercentToLocalizedStringTransformer implements DataTransformerInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ('' === $value) {
|
if ('' === $value) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$position = 0;
|
$position = 0;
|
||||||
|
@ -74,7 +74,7 @@ class ValueToDuplicatesTransformer implements DataTransformerInterface
|
|||||||
if (\count($emptyKeys) > 0) {
|
if (\count($emptyKeys) > 0) {
|
||||||
if (\count($emptyKeys) == \count($this->keys)) {
|
if (\count($emptyKeys) == \count($this->keys)) {
|
||||||
// All keys empty
|
// All keys empty
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new TransformationFailedException(sprintf('The keys "%s" should not be empty', implode('", "', $emptyKeys)));
|
throw new TransformationFailedException(sprintf('The keys "%s" should not be empty', implode('", "', $emptyKeys)));
|
||||||
|
@ -134,7 +134,7 @@ class ViolationPath implements \IteratorAggregate, PropertyPathInterface
|
|||||||
public function getParent()
|
public function getParent()
|
||||||
{
|
{
|
||||||
if ($this->length <= 1) {
|
if ($this->length <= 1) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$parent = clone $this;
|
$parent = clone $this;
|
||||||
|
@ -48,7 +48,7 @@ class ServerParams
|
|||||||
$iniMax = strtolower($this->getNormalizedIniPostMaxSize());
|
$iniMax = strtolower($this->getNormalizedIniPostMaxSize());
|
||||||
|
|
||||||
if ('' === $iniMax) {
|
if ('' === $iniMax) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$max = ltrim($iniMax, '+');
|
$max = ltrim($iniMax, '+');
|
||||||
|
@ -79,7 +79,7 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!self::isSupported()) {
|
if (!self::isSupported()) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
ob_start();
|
ob_start();
|
||||||
@ -89,14 +89,14 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
|
|||||||
if ($return > 0) {
|
if ($return > 0) {
|
||||||
ob_end_clean();
|
ob_end_clean();
|
||||||
|
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$type = trim(ob_get_clean());
|
$type = trim(ob_get_clean());
|
||||||
|
|
||||||
if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\.]+)#i', $type, $match)) {
|
if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\.]+)#i', $type, $match)) {
|
||||||
// it's not a type, but an error message
|
// it's not a type, but an error message
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $match[1];
|
return $match[1];
|
||||||
|
@ -62,11 +62,11 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!self::isSupported()) {
|
if (!self::isSupported()) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$finfo = new \finfo(FILEINFO_MIME_TYPE, $this->magicFile)) {
|
if (!$finfo = new \finfo(FILEINFO_MIME_TYPE, $this->magicFile)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $finfo->file($path);
|
return $finfo->file($path);
|
||||||
|
@ -29,7 +29,7 @@ interface MimeTypeGuesserInterface
|
|||||||
*
|
*
|
||||||
* @param string $path The path to the file
|
* @param string $path The path to the file
|
||||||
*
|
*
|
||||||
* @return string The mime type or NULL, if none could be guessed
|
* @return string|null The mime type or NULL, if none could be guessed
|
||||||
*
|
*
|
||||||
* @throws FileNotFoundException If the file does not exist
|
* @throws FileNotFoundException If the file does not exist
|
||||||
* @throws AccessDeniedException If the file could not be read
|
* @throws AccessDeniedException If the file could not be read
|
||||||
|
@ -47,7 +47,7 @@ class RequestStack
|
|||||||
public function pop()
|
public function pop()
|
||||||
{
|
{
|
||||||
if (!$this->requests) {
|
if (!$this->requests) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return array_pop($this->requests);
|
return array_pop($this->requests);
|
||||||
@ -73,7 +73,7 @@ class RequestStack
|
|||||||
public function getMasterRequest()
|
public function getMasterRequest()
|
||||||
{
|
{
|
||||||
if (!$this->requests) {
|
if (!$this->requests) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->requests[0];
|
return $this->requests[0];
|
||||||
@ -95,7 +95,7 @@ class RequestStack
|
|||||||
$pos = \count($this->requests) - 2;
|
$pos = \count($this->requests) - 2;
|
||||||
|
|
||||||
if (!isset($this->requests[$pos])) {
|
if (!isset($this->requests[$pos])) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->requests[$pos];
|
return $this->requests[$pos];
|
||||||
|
@ -35,7 +35,7 @@ class SessionListener extends AbstractSessionListener
|
|||||||
protected function getSession()
|
protected function getSession()
|
||||||
{
|
{
|
||||||
if (!$this->container->has('session')) {
|
if (!$this->container->has('session')) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->container->has('session_storage')
|
if ($this->container->has('session_storage')
|
||||||
|
@ -33,7 +33,7 @@ class TestSessionListener extends AbstractTestSessionListener
|
|||||||
protected function getSession()
|
protected function getSession()
|
||||||
{
|
{
|
||||||
if (!$this->container->has('session')) {
|
if (!$this->container->has('session')) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->container->get('session');
|
return $this->container->get('session');
|
||||||
|
@ -116,7 +116,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
|
|||||||
public function read($token)
|
public function read($token)
|
||||||
{
|
{
|
||||||
if (!$token || !file_exists($file = $this->getFilename($token))) {
|
if (!$token || !file_exists($file = $this->getFilename($token))) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->createProfileFromData($token, unserialize(file_get_contents($file)));
|
return $this->createProfileFromData($token, unserialize(file_get_contents($file)));
|
||||||
@ -227,7 +227,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
|
|||||||
$position = ftell($file);
|
$position = ftell($file);
|
||||||
|
|
||||||
if (0 === $position) {
|
if (0 === $position) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
|
@ -143,7 +143,7 @@ class Profiler implements ResetInterface
|
|||||||
public function collect(Request $request, Response $response, \Exception $exception = null)
|
public function collect(Request $request, Response $response, \Exception $exception = null)
|
||||||
{
|
{
|
||||||
if (false === $this->enabled) {
|
if (false === $this->enabled) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$profile = new Profile(substr(hash('sha256', uniqid(mt_rand(), true)), 0, 6));
|
$profile = new Profile(substr(hash('sha256', uniqid(mt_rand(), true)), 0, 6));
|
||||||
|
@ -47,7 +47,7 @@ interface ProfilerStorageInterface
|
|||||||
*
|
*
|
||||||
* @param string $token A token
|
* @param string $token A token
|
||||||
*
|
*
|
||||||
* @return Profile The profile associated with token
|
* @return Profile|null The profile associated with token
|
||||||
*/
|
*/
|
||||||
public function read($token);
|
public function read($token);
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@ class LocaleDataGenerator extends AbstractDataGenerator
|
|||||||
// Don't generate aliases, as they are resolved during runtime
|
// Don't generate aliases, as they are resolved during runtime
|
||||||
// Unless an alias is needed as fallback for de-duplication purposes
|
// Unless an alias is needed as fallback for de-duplication purposes
|
||||||
if (isset($this->localeAliases[$displayLocale]) && !$this->generatingFallback) {
|
if (isset($this->localeAliases[$displayLocale]) && !$this->generatingFallback) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate locale names for all locales that have translations in
|
// Generate locale names for all locales that have translations in
|
||||||
@ -124,7 +124,7 @@ class LocaleDataGenerator extends AbstractDataGenerator
|
|||||||
$data['Names'] = array_diff($data['Names'], $fallbackData['Names']);
|
$data['Names'] = array_diff($data['Names'], $fallbackData['Names']);
|
||||||
}
|
}
|
||||||
if (!$data['Names']) {
|
if (!$data['Names']) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $data;
|
return $data;
|
||||||
|
@ -42,7 +42,7 @@ class CurrencyBundle extends CurrencyDataProvider implements CurrencyBundleInter
|
|||||||
try {
|
try {
|
||||||
return $this->getSymbol($currency, $displayLocale);
|
return $this->getSymbol($currency, $displayLocale);
|
||||||
} catch (MissingResourceException $e) {
|
} catch (MissingResourceException $e) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -54,7 +54,7 @@ class CurrencyBundle extends CurrencyDataProvider implements CurrencyBundleInter
|
|||||||
try {
|
try {
|
||||||
return $this->getName($currency, $displayLocale);
|
return $this->getName($currency, $displayLocale);
|
||||||
} catch (MissingResourceException $e) {
|
} catch (MissingResourceException $e) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,7 +54,7 @@ class LanguageBundle extends LanguageDataProvider implements LanguageBundleInter
|
|||||||
try {
|
try {
|
||||||
return $this->getName($language, $displayLocale);
|
return $this->getName($language, $displayLocale);
|
||||||
} catch (MissingResourceException $e) {
|
} catch (MissingResourceException $e) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,7 +78,7 @@ class LanguageBundle extends LanguageDataProvider implements LanguageBundleInter
|
|||||||
try {
|
try {
|
||||||
return $this->scriptProvider->getName($script, $displayLocale);
|
return $this->scriptProvider->getName($script, $displayLocale);
|
||||||
} catch (MissingResourceException $e) {
|
} catch (MissingResourceException $e) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ class LocaleBundle extends LocaleDataProvider implements LocaleBundleInterface
|
|||||||
try {
|
try {
|
||||||
return $this->getName($locale, $displayLocale);
|
return $this->getName($locale, $displayLocale);
|
||||||
} catch (MissingResourceException $e) {
|
} catch (MissingResourceException $e) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ class RegionBundle extends RegionDataProvider implements RegionBundleInterface
|
|||||||
try {
|
try {
|
||||||
return $this->getName($country, $displayLocale);
|
return $this->getName($country, $displayLocale);
|
||||||
} catch (MissingResourceException $e) {
|
} catch (MissingResourceException $e) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@ class Version
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!preg_match('/^'.$pattern.'/', $version, $matches)) {
|
if (!preg_match('/^'.$pattern.'/', $version, $matches)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $matches[0];
|
return $matches[0];
|
||||||
|
@ -753,7 +753,7 @@ class Process implements \IteratorAggregate
|
|||||||
public function getExitCodeText()
|
public function getExitCodeText()
|
||||||
{
|
{
|
||||||
if (null === $exitcode = $this->getExitCode()) {
|
if (null === $exitcode = $this->getExitCode()) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return isset(self::$exitCodes[$exitcode]) ? self::$exitCodes[$exitcode] : 'Unknown error';
|
return isset(self::$exitCodes[$exitcode]) ? self::$exitCodes[$exitcode] : 'Unknown error';
|
||||||
|
@ -136,7 +136,7 @@ class PropertyPath implements \IteratorAggregate, PropertyPathInterface
|
|||||||
public function getParent()
|
public function getParent()
|
||||||
{
|
{
|
||||||
if ($this->length <= 1) {
|
if ($this->length <= 1) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$parent = clone $this;
|
$parent = clone $this;
|
||||||
|
@ -40,7 +40,7 @@ interface PropertyPathInterface extends \Traversable
|
|||||||
*
|
*
|
||||||
* If this property path only contains one item, null is returned.
|
* If this property path only contains one item, null is returned.
|
||||||
*
|
*
|
||||||
* @return PropertyPath The parent path or null
|
* @return PropertyPath|null The parent path or null
|
||||||
*/
|
*/
|
||||||
public function getParent();
|
public function getParent();
|
||||||
|
|
||||||
|
@ -73,7 +73,7 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
|
|||||||
/** @var $docBlock DocBlock */
|
/** @var $docBlock DocBlock */
|
||||||
list($docBlock) = $this->getDocBlock($class, $property);
|
list($docBlock) = $this->getDocBlock($class, $property);
|
||||||
if (!$docBlock) {
|
if (!$docBlock) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$shortDescription = $docBlock->getSummary();
|
$shortDescription = $docBlock->getSummary();
|
||||||
@ -99,7 +99,7 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
|
|||||||
/** @var $docBlock DocBlock */
|
/** @var $docBlock DocBlock */
|
||||||
list($docBlock) = $this->getDocBlock($class, $property);
|
list($docBlock) = $this->getDocBlock($class, $property);
|
||||||
if (!$docBlock) {
|
if (!$docBlock) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$contents = $docBlock->getDescription()->render();
|
$contents = $docBlock->getDescription()->render();
|
||||||
@ -115,7 +115,7 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
|
|||||||
/** @var $docBlock DocBlock */
|
/** @var $docBlock DocBlock */
|
||||||
list($docBlock, $source, $prefix) = $this->getDocBlock($class, $property);
|
list($docBlock, $source, $prefix) = $this->getDocBlock($class, $property);
|
||||||
if (!$docBlock) {
|
if (!$docBlock) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch ($source) {
|
switch ($source) {
|
||||||
@ -141,7 +141,7 @@ class PhpDocExtractor implements PropertyDescriptionExtractorInterface, Property
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!isset($types[0])) {
|
if (!isset($types[0])) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!\in_array($prefix, $this->arrayMutatorPrefixes)) {
|
if (!\in_array($prefix, $this->arrayMutatorPrefixes)) {
|
||||||
|
@ -80,7 +80,7 @@ class ReflectionExtractor implements PropertyListExtractorInterface, PropertyTyp
|
|||||||
try {
|
try {
|
||||||
$reflectionClass = new \ReflectionClass($class);
|
$reflectionClass = new \ReflectionClass($class);
|
||||||
} catch (\ReflectionException $e) {
|
} catch (\ReflectionException $e) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$propertyFlags = 0;
|
$propertyFlags = 0;
|
||||||
|
@ -36,11 +36,11 @@ class SerializerExtractor implements PropertyListExtractorInterface
|
|||||||
public function getProperties($class, array $context = [])
|
public function getProperties($class, array $context = [])
|
||||||
{
|
{
|
||||||
if (!isset($context['serializer_groups']) || !\is_array($context['serializer_groups'])) {
|
if (!isset($context['serializer_groups']) || !\is_array($context['serializer_groups'])) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->classMetadataFactory->getMetadataFor($class)) {
|
if (!$this->classMetadataFactory->getMetadataFor($class)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$properties = [];
|
$properties = [];
|
||||||
|
@ -46,7 +46,7 @@ class AnnotationFileLoader extends FileLoader
|
|||||||
* @param string $file A PHP file path
|
* @param string $file A PHP file path
|
||||||
* @param string|null $type The resource type
|
* @param string|null $type The resource type
|
||||||
*
|
*
|
||||||
* @return RouteCollection A RouteCollection instance
|
* @return RouteCollection|null A RouteCollection instance
|
||||||
*
|
*
|
||||||
* @throws \InvalidArgumentException When the file does not exist or its routes cannot be parsed
|
* @throws \InvalidArgumentException When the file does not exist or its routes cannot be parsed
|
||||||
*/
|
*/
|
||||||
@ -58,7 +58,7 @@ class AnnotationFileLoader extends FileLoader
|
|||||||
if ($class = $this->findClass($path)) {
|
if ($class = $this->findClass($path)) {
|
||||||
$refl = new \ReflectionClass($class);
|
$refl = new \ReflectionClass($class);
|
||||||
if ($refl->isAbstract()) {
|
if ($refl->isAbstract()) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$collection->addResource(new FileResource($path));
|
$collection->addResource(new FileResource($path));
|
||||||
|
@ -88,7 +88,7 @@ class NativeSessionTokenStorage implements ClearableTokenStorageInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!isset($_SESSION[$this->namespace][$tokenId])) {
|
if (!isset($_SESSION[$this->namespace][$tokenId])) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$token = (string) $_SESSION[$this->namespace][$tokenId];
|
$token = (string) $_SESSION[$this->namespace][$tokenId];
|
||||||
|
@ -45,7 +45,7 @@ final class ParameterBagUtils
|
|||||||
$root = substr($path, 0, $pos);
|
$root = substr($path, 0, $pos);
|
||||||
|
|
||||||
if (null === $value = $parameters->get($root)) {
|
if (null === $value = $parameters->get($root)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (null === self::$propertyAccessor) {
|
if (null === self::$propertyAccessor) {
|
||||||
@ -55,7 +55,7 @@ final class ParameterBagUtils
|
|||||||
try {
|
try {
|
||||||
return self::$propertyAccessor->getValue($value, substr($path, $pos));
|
return self::$propertyAccessor->getValue($value, substr($path, $pos));
|
||||||
} catch (AccessException $e) {
|
} catch (AccessException $e) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,7 +80,7 @@ final class ParameterBagUtils
|
|||||||
$root = substr($path, 0, $pos);
|
$root = substr($path, 0, $pos);
|
||||||
|
|
||||||
if (null === $value = $request->get($root)) {
|
if (null === $value = $request->get($root)) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (null === self::$propertyAccessor) {
|
if (null === self::$propertyAccessor) {
|
||||||
@ -90,7 +90,7 @@ final class ParameterBagUtils
|
|||||||
try {
|
try {
|
||||||
return self::$propertyAccessor->getValue($value, substr($path, $pos));
|
return self::$propertyAccessor->getValue($value, substr($path, $pos));
|
||||||
} catch (AccessException $e) {
|
} catch (AccessException $e) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -82,7 +82,7 @@ class Regex extends Constraint
|
|||||||
|
|
||||||
// Quit if delimiters not at very beginning/end (e.g. when options are passed)
|
// Quit if delimiters not at very beginning/end (e.g. when options are passed)
|
||||||
if ($this->pattern[0] !== $this->pattern[\strlen($this->pattern) - 1]) {
|
if ($this->pattern[0] !== $this->pattern[\strlen($this->pattern) - 1]) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$delimiter = $this->pattern[0];
|
$delimiter = $this->pattern[0];
|
||||||
|
@ -223,7 +223,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
|
|||||||
$item = $item->value;
|
$item = $item->value;
|
||||||
}
|
}
|
||||||
if (!($item = $this->getStub($item)) instanceof Stub || !$item->position) {
|
if (!($item = $this->getStub($item)) instanceof Stub || !$item->position) {
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
$keys = [$key];
|
$keys = [$key];
|
||||||
|
|
||||||
@ -238,7 +238,7 @@ class Data implements \ArrayAccess, \Countable, \IteratorAggregate
|
|||||||
case Stub::TYPE_RESOURCE:
|
case Stub::TYPE_RESOURCE:
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = null;
|
$data = null;
|
||||||
|
Reference in New Issue
Block a user