Merge branch '2.8'
* 2.8: [PhpUnit] exit gracefully to workaround segfaults at shutdown time [ExpressionLanguage] marked node classes as being internal [Yaml] marked some classes as being internal
This commit is contained in:
commit
38a70f30fa
@ -52,7 +52,8 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener
|
|||||||
$this->state = 2;
|
$this->state = 2;
|
||||||
|
|
||||||
if (!$this->wasSkipped = require $this->skippedFile) {
|
if (!$this->wasSkipped = require $this->skippedFile) {
|
||||||
exit("All tests already ran successfully.\n");
|
echo "All tests already ran successfully.\n";
|
||||||
|
$suite->setTests(array());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
|
|||||||
|
|
||||||
use Symfony\Component\ExpressionLanguage\Compiler;
|
use Symfony\Component\ExpressionLanguage\Compiler;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
class ArgumentsNode extends ArrayNode
|
class ArgumentsNode extends ArrayNode
|
||||||
{
|
{
|
||||||
public function compile(Compiler $compiler)
|
public function compile(Compiler $compiler)
|
||||||
|
@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
|
|||||||
|
|
||||||
use Symfony\Component\ExpressionLanguage\Compiler;
|
use Symfony\Component\ExpressionLanguage\Compiler;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
class ArrayNode extends Node
|
class ArrayNode extends Node
|
||||||
{
|
{
|
||||||
protected $index;
|
protected $index;
|
||||||
|
@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
|
|||||||
|
|
||||||
use Symfony\Component\ExpressionLanguage\Compiler;
|
use Symfony\Component\ExpressionLanguage\Compiler;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
class BinaryNode extends Node
|
class BinaryNode extends Node
|
||||||
{
|
{
|
||||||
private static $operators = array(
|
private static $operators = array(
|
||||||
|
@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
|
|||||||
|
|
||||||
use Symfony\Component\ExpressionLanguage\Compiler;
|
use Symfony\Component\ExpressionLanguage\Compiler;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
class ConditionalNode extends Node
|
class ConditionalNode extends Node
|
||||||
{
|
{
|
||||||
public function __construct(Node $expr1, Node $expr2, Node $expr3)
|
public function __construct(Node $expr1, Node $expr2, Node $expr3)
|
||||||
|
@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
|
|||||||
|
|
||||||
use Symfony\Component\ExpressionLanguage\Compiler;
|
use Symfony\Component\ExpressionLanguage\Compiler;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
class ConstantNode extends Node
|
class ConstantNode extends Node
|
||||||
{
|
{
|
||||||
public function __construct($value)
|
public function __construct($value)
|
||||||
|
@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
|
|||||||
|
|
||||||
use Symfony\Component\ExpressionLanguage\Compiler;
|
use Symfony\Component\ExpressionLanguage\Compiler;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
class FunctionNode extends Node
|
class FunctionNode extends Node
|
||||||
{
|
{
|
||||||
public function __construct($name, Node $arguments)
|
public function __construct($name, Node $arguments)
|
||||||
|
@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
|
|||||||
|
|
||||||
use Symfony\Component\ExpressionLanguage\Compiler;
|
use Symfony\Component\ExpressionLanguage\Compiler;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
class GetAttrNode extends Node
|
class GetAttrNode extends Node
|
||||||
{
|
{
|
||||||
const PROPERTY_CALL = 1;
|
const PROPERTY_CALL = 1;
|
||||||
|
@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
|
|||||||
|
|
||||||
use Symfony\Component\ExpressionLanguage\Compiler;
|
use Symfony\Component\ExpressionLanguage\Compiler;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
class NameNode extends Node
|
class NameNode extends Node
|
||||||
{
|
{
|
||||||
public function __construct($name)
|
public function __construct($name)
|
||||||
|
@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
|
|||||||
|
|
||||||
use Symfony\Component\ExpressionLanguage\Compiler;
|
use Symfony\Component\ExpressionLanguage\Compiler;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
|
*/
|
||||||
class UnaryNode extends Node
|
class UnaryNode extends Node
|
||||||
{
|
{
|
||||||
private static $operators = array(
|
private static $operators = array(
|
||||||
|
@ -16,6 +16,8 @@ namespace Symfony\Component\Yaml;
|
|||||||
* YAML strings.
|
* YAML strings.
|
||||||
*
|
*
|
||||||
* @author Matthew Lewinski <matthew@lewinski.org>
|
* @author Matthew Lewinski <matthew@lewinski.org>
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
*/
|
*/
|
||||||
class Escaper
|
class Escaper
|
||||||
{
|
{
|
||||||
|
@ -204,6 +204,8 @@ class Inline
|
|||||||
* @return string A YAML string
|
* @return string A YAML string
|
||||||
*
|
*
|
||||||
* @throws ParseException When malformed inline YAML string is parsed
|
* @throws ParseException When malformed inline YAML string is parsed
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
*/
|
*/
|
||||||
public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true, $references = array())
|
public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true, $references = array())
|
||||||
{
|
{
|
||||||
|
@ -18,6 +18,8 @@ use Symfony\Component\Yaml\Exception\ParseException;
|
|||||||
* YAML strings.
|
* YAML strings.
|
||||||
*
|
*
|
||||||
* @author Matthew Lewinski <matthew@lewinski.org>
|
* @author Matthew Lewinski <matthew@lewinski.org>
|
||||||
|
*
|
||||||
|
* @internal
|
||||||
*/
|
*/
|
||||||
class Unescaper
|
class Unescaper
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user