From 29e789301ad43fedcfb2f2a5744cad12eb5312f9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 12 Oct 2015 13:16:35 +0200 Subject: [PATCH 1/3] [Yaml] marked some classes as being internal --- src/Symfony/Component/Yaml/Escaper.php | 2 ++ src/Symfony/Component/Yaml/Inline.php | 2 ++ src/Symfony/Component/Yaml/Unescaper.php | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/Symfony/Component/Yaml/Escaper.php b/src/Symfony/Component/Yaml/Escaper.php index ac325a2c2f..3487a6ac9b 100644 --- a/src/Symfony/Component/Yaml/Escaper.php +++ b/src/Symfony/Component/Yaml/Escaper.php @@ -16,6 +16,8 @@ namespace Symfony\Component\Yaml; * YAML strings. * * @author Matthew Lewinski + * + * @internal */ class Escaper { diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php index a5b53bd965..e3470aa5f5 100644 --- a/src/Symfony/Component/Yaml/Inline.php +++ b/src/Symfony/Component/Yaml/Inline.php @@ -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()) { diff --git a/src/Symfony/Component/Yaml/Unescaper.php b/src/Symfony/Component/Yaml/Unescaper.php index e5eaab0e17..d2f5054ad2 100644 --- a/src/Symfony/Component/Yaml/Unescaper.php +++ b/src/Symfony/Component/Yaml/Unescaper.php @@ -16,6 +16,8 @@ namespace Symfony\Component\Yaml; * YAML strings. * * @author Matthew Lewinski + * + * @internal */ class Unescaper { From 7d6bc483a6b072d7e710249f764952a96eab308e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 12 Oct 2015 13:22:22 +0200 Subject: [PATCH 2/3] [ExpressionLanguage] marked node classes as being internal --- .../Component/ExpressionLanguage/Node/ArgumentsNode.php | 5 +++++ src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php | 5 +++++ src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php | 5 +++++ .../Component/ExpressionLanguage/Node/ConditionalNode.php | 5 +++++ .../Component/ExpressionLanguage/Node/ConstantNode.php | 5 +++++ .../Component/ExpressionLanguage/Node/FunctionNode.php | 5 +++++ .../Component/ExpressionLanguage/Node/GetAttrNode.php | 5 +++++ src/Symfony/Component/ExpressionLanguage/Node/NameNode.php | 5 +++++ src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php | 5 +++++ 9 files changed, 45 insertions(+) diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php index f440101684..d97057934b 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/ArgumentsNode.php @@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node; use Symfony\Component\ExpressionLanguage\Compiler; +/** + * @author Fabien Potencier + * + * @internal + */ class ArgumentsNode extends ArrayNode { public function compile(Compiler $compiler) diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php index f110f542ad..465527e5b7 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php @@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node; use Symfony\Component\ExpressionLanguage\Compiler; +/** + * @author Fabien Potencier + * + * @internal + */ class ArrayNode extends Node { protected $index; diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php index 597cc8918d..8cf1bc2e43 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php @@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node; use Symfony\Component\ExpressionLanguage\Compiler; +/** + * @author Fabien Potencier + * + * @internal + */ class BinaryNode extends Node { private static $operators = array( diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php index 7de1e3de12..5d326faeb1 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php @@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node; use Symfony\Component\ExpressionLanguage\Compiler; +/** + * @author Fabien Potencier + * + * @internal + */ class ConditionalNode extends Node { public function __construct(Node $expr1, Node $expr2, Node $expr3) diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php index 7842e57877..9369d859fc 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php @@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node; use Symfony\Component\ExpressionLanguage\Compiler; +/** + * @author Fabien Potencier + * + * @internal + */ class ConstantNode extends Node { public function __construct($value) diff --git a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php index 4a290a488d..ab23acb94c 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php @@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node; use Symfony\Component\ExpressionLanguage\Compiler; +/** + * @author Fabien Potencier + * + * @internal + */ class FunctionNode extends Node { public function __construct($name, Node $arguments) diff --git a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php index b3f98bf565..ae22deb8a0 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php @@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node; use Symfony\Component\ExpressionLanguage\Compiler; +/** + * @author Fabien Potencier + * + * @internal + */ class GetAttrNode extends Node { const PROPERTY_CALL = 1; diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php index 3d39f4077e..30336ba75a 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php @@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node; use Symfony\Component\ExpressionLanguage\Compiler; +/** + * @author Fabien Potencier + * + * @internal + */ class NameNode extends Node { public function __construct($name) diff --git a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php index fd980e5b7a..68fec552a0 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php @@ -13,6 +13,11 @@ namespace Symfony\Component\ExpressionLanguage\Node; use Symfony\Component\ExpressionLanguage\Compiler; +/** + * @author Fabien Potencier + * + * @internal + */ class UnaryNode extends Node { private static $operators = array( From 1a93494f7da98bcf5208a8d95444fd15eaa6c98b Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 13 Oct 2015 17:54:10 +0200 Subject: [PATCH 3/3] [PhpUnit] exit gracefully to workaround segfaults at shutdown time --- src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php index 9f811e5f70..367cc826dc 100644 --- a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php +++ b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php @@ -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()); } } }