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:
Nicolas Grekas 2015-10-13 18:01:35 +02:00
commit 38a70f30fa
13 changed files with 53 additions and 1 deletions

View File

@ -52,7 +52,8 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener
$this->state = 2;
if (!$this->wasSkipped = require $this->skippedFile) {
exit("All tests already ran successfully.\n");
echo "All tests already ran successfully.\n";
$suite->setTests(array());
}
}
}

View File

@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
use Symfony\Component\ExpressionLanguage\Compiler;
/**
* @author Fabien Potencier <fabien@symfony.com>
*
* @internal
*/
class ArgumentsNode extends ArrayNode
{
public function compile(Compiler $compiler)

View File

@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
use Symfony\Component\ExpressionLanguage\Compiler;
/**
* @author Fabien Potencier <fabien@symfony.com>
*
* @internal
*/
class ArrayNode extends Node
{
protected $index;

View File

@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
use Symfony\Component\ExpressionLanguage\Compiler;
/**
* @author Fabien Potencier <fabien@symfony.com>
*
* @internal
*/
class BinaryNode extends Node
{
private static $operators = array(

View File

@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
use Symfony\Component\ExpressionLanguage\Compiler;
/**
* @author Fabien Potencier <fabien@symfony.com>
*
* @internal
*/
class ConditionalNode extends Node
{
public function __construct(Node $expr1, Node $expr2, Node $expr3)

View File

@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
use Symfony\Component\ExpressionLanguage\Compiler;
/**
* @author Fabien Potencier <fabien@symfony.com>
*
* @internal
*/
class ConstantNode extends Node
{
public function __construct($value)

View File

@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
use Symfony\Component\ExpressionLanguage\Compiler;
/**
* @author Fabien Potencier <fabien@symfony.com>
*
* @internal
*/
class FunctionNode extends Node
{
public function __construct($name, Node $arguments)

View File

@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
use Symfony\Component\ExpressionLanguage\Compiler;
/**
* @author Fabien Potencier <fabien@symfony.com>
*
* @internal
*/
class GetAttrNode extends Node
{
const PROPERTY_CALL = 1;

View File

@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
use Symfony\Component\ExpressionLanguage\Compiler;
/**
* @author Fabien Potencier <fabien@symfony.com>
*
* @internal
*/
class NameNode extends Node
{
public function __construct($name)

View File

@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node;
use Symfony\Component\ExpressionLanguage\Compiler;
/**
* @author Fabien Potencier <fabien@symfony.com>
*
* @internal
*/
class UnaryNode extends Node
{
private static $operators = array(

View File

@ -16,6 +16,8 @@ namespace Symfony\Component\Yaml;
* YAML strings.
*
* @author Matthew Lewinski <matthew@lewinski.org>
*
* @internal
*/
class Escaper
{

View File

@ -204,6 +204,8 @@ class Inline
* @return string A YAML string
*
* @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())
{

View File

@ -18,6 +18,8 @@ use Symfony\Component\Yaml\Exception\ParseException;
* YAML strings.
*
* @author Matthew Lewinski <matthew@lewinski.org>
*
* @internal
*/
class Unescaper
{