Skip to content

Commit 38a70f3

Browse files
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
2 parents 138654d + 5958eb4 commit 38a70f3

13 files changed

+53
-1
lines changed

src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
5252
$this->state = 2;
5353

5454
if (!$this->wasSkipped = require $this->skippedFile) {
55-
exit("All tests already ran successfully.\n");
55+
echo "All tests already ran successfully.\n";
56+
$suite->setTests(array());
5657
}
5758
}
5859
}

src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313

1414
use Symfony\Component\ExpressionLanguage\Compiler;
1515

16+
/**
17+
* @author Fabien Potencier <[email protected]>
18+
*
19+
* @internal
20+
*/
1621
class ArgumentsNode extends ArrayNode
1722
{
1823
public function compile(Compiler $compiler)

src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313

1414
use Symfony\Component\ExpressionLanguage\Compiler;
1515

16+
/**
17+
* @author Fabien Potencier <[email protected]>
18+
*
19+
* @internal
20+
*/
1621
class ArrayNode extends Node
1722
{
1823
protected $index;

src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313

1414
use Symfony\Component\ExpressionLanguage\Compiler;
1515

16+
/**
17+
* @author Fabien Potencier <[email protected]>
18+
*
19+
* @internal
20+
*/
1621
class BinaryNode extends Node
1722
{
1823
private static $operators = array(

src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313

1414
use Symfony\Component\ExpressionLanguage\Compiler;
1515

16+
/**
17+
* @author Fabien Potencier <[email protected]>
18+
*
19+
* @internal
20+
*/
1621
class ConditionalNode extends Node
1722
{
1823
public function __construct(Node $expr1, Node $expr2, Node $expr3)

src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313

1414
use Symfony\Component\ExpressionLanguage\Compiler;
1515

16+
/**
17+
* @author Fabien Potencier <[email protected]>
18+
*
19+
* @internal
20+
*/
1621
class ConstantNode extends Node
1722
{
1823
public function __construct($value)

src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313

1414
use Symfony\Component\ExpressionLanguage\Compiler;
1515

16+
/**
17+
* @author Fabien Potencier <[email protected]>
18+
*
19+
* @internal
20+
*/
1621
class FunctionNode extends Node
1722
{
1823
public function __construct($name, Node $arguments)

src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313

1414
use Symfony\Component\ExpressionLanguage\Compiler;
1515

16+
/**
17+
* @author Fabien Potencier <[email protected]>
18+
*
19+
* @internal
20+
*/
1621
class GetAttrNode extends Node
1722
{
1823
const PROPERTY_CALL = 1;

src/Symfony/Component/ExpressionLanguage/Node/NameNode.php

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313

1414
use Symfony\Component\ExpressionLanguage\Compiler;
1515

16+
/**
17+
* @author Fabien Potencier <[email protected]>
18+
*
19+
* @internal
20+
*/
1621
class NameNode extends Node
1722
{
1823
public function __construct($name)

src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313

1414
use Symfony\Component\ExpressionLanguage\Compiler;
1515

16+
/**
17+
* @author Fabien Potencier <[email protected]>
18+
*
19+
* @internal
20+
*/
1621
class UnaryNode extends Node
1722
{
1823
private static $operators = array(

src/Symfony/Component/Yaml/Escaper.php

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
* YAML strings.
1717
*
1818
* @author Matthew Lewinski <[email protected]>
19+
*
20+
* @internal
1921
*/
2022
class Escaper
2123
{

src/Symfony/Component/Yaml/Inline.php

+2
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ private static function dumpArray($value, $exceptionOnInvalidType, $objectSuppor
204204
* @return string A YAML string
205205
*
206206
* @throws ParseException When malformed inline YAML string is parsed
207+
*
208+
* @internal
207209
*/
208210
public static function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true, $references = array())
209211
{

src/Symfony/Component/Yaml/Unescaper.php

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
* YAML strings.
1919
*
2020
* @author Matthew Lewinski <[email protected]>
21+
*
22+
* @internal
2123
*/
2224
class Unescaper
2325
{

0 commit comments

Comments
 (0)