8000 Merge branch '2.8' into 3.3 · symfony/symfony@00e8908 · GitHub
[go: up one dir, main page]
Skip to content

Commit 00e8908

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.3
* 2.8: PHP CS Fixer: clean up repo and adjust config Dumper shouldn't use html format for phpdbg [Validator] Fix access to root object when using composite constraint
2 parents 22b7d12 + 5150086 commit 00e8908

File tree

24 files changed

+72
-27
lines changed

24 files changed

+72
-27
lines changed

‎.php_cs.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,9 @@ return PhpCsFixer\Config::create()
3636
->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
3737
// explicit heredoc test
3838
->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
39+
// explicit trigger_error tests
40+
->notPath('Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt')
41+
->notPath('Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt')
42+
->notPath('Symfony/Component/Debug/Tests/DebugClassLoaderTest.php')
3943
)
4044
;

‎src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,35 @@ public function getTransTests()
8989
array('{% trans into "fr"%}Hello{% endtrans %}', 'Hello'),
9090

9191
// transchoice
92-
array('{% transchoice count from "messages" %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
93-
'There is no apples', array('count' => 0)),
94-
array('{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
95-
'There is 5 apples', array('count' => 5)),
96-
array('{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
97-
'There is 5 apples (Symfony)', array('count' => 5, 'name' => 'Symfony')),
98-
array('{% transchoice count with { \'%name%\': \'Symfony\' } %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
99-
'There is 5 apples (Symfony)', array('count' => 5)),
100-
array('{% transchoice count into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
101-
'There is no apples', array('count' => 0)),
102-
array('{% transchoice 5 into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
103-
'There is 5 apples'),
92+
array(
93+
'{% transchoice count from "messages" %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
94+
'There is no apples',
95+
array('count' => 0),
96+
),
97+
array(
98+
'{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
99+
'There is 5 apples',
100+
array('count' => 5),
101+
),
102+
array(
103+
'{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
104+
'There is 5 apples (Symfony)',
105+
array('count' => 5, 'name' => 'Symfony'),
106+
),
107+
array(
108+
'{% transchoice count with { \'%name%\': \'Symfony\' } %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
109+
'There is 5 apples (Symfony)',
110+
array('count' => 5),
111+
),
112+
array(
113+
'{% transchoice count into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
114+
'There is no apples',
115+
array('count' => 0),
116+
),
117+
array(
118+
'{% transchoice 5 into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
119+
'There is 5 apples',
120+
),
104121

105122
// trans filter
106123
array('{{ "Hello"|trans }}', 'Hello'),

‎src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ class Translator extends BaseTranslator implements WarmableInterface
4848
private $resources = array();
4949

5050
/**
51+
* Constructor.
52+
*
5153
* Available options:
5254
*
5355
* * cache_dir: The cache directory (or null to disable caching)

‎src/Symfony/Component/Cache/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016-present Fabien Potencier
1+
Copyright (c) 2016-2018 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/Debug/Resources/ext/tests/001.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
--TEST--
22
Test symfony_zval_info API
33
--SKIPIF--
4-
<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
4+
<?php if (!extension_loaded('symfony_debug')) {
5+
echo 'skip';
6+
} ?>
57
--FILE--
68
<?php
79

‎src/Symfony/Component/Debug/Resources/ext/tests/002.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
--TEST--
22
Test symfony_debug_backtrace in case of fatal error
33
--SKIPIF--
4-
<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
4+
<?php if (!extension_loaded('symfony_debug')) {
5+
echo 'skip';
6+
} ?>
57
--FILE--
68
<?php
79

‎src/Symfony/Component/Debug/Resources/ext/tests/002_1.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
--TEST--
22
Test symfony_debug_backtrace in case of non fatal error
33
--SKIPIF--
4-
<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
4+
<?php if (!extension_loaded('symfony_debug')) {
5+
echo 'skip';
6+
} ?>
57
--FILE--
68
<?php
79

‎src/Symfony/Component/Debug/Resources/ext/tests/003.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
--TEST--
22
Test ErrorHandler in case of fatal error
33
--SKIPIF--
4-
<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
4+
<?php if (!extension_loaded('symfony_debug')) {
5+
echo 'skip';
6+
} ?>
57
--FILE--
68
<?php
79

‎src/Symfony/Component/Debug/Tests/phpt/exception_rethrown.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ ErrorHandler::register()->setDefaultLogger(new TestLogger());
2626
ini_set('display_errors', 1);
2727

2828
throw new \Exception('foo');
29-
3029
?>
3130
--EXPECTF--
3231
Uncaught Exception: foo

‎src/Symfony/Component/Debug/Tests/phpt/fatal_with_nested_handlers.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ var_dump(array(
2424
$eHandler[0]->setExceptionHandler('print_r');
2525

2626
if (true) {
27-
class Broken implements \Serializable {};
27+
class Broken implements \Serializable
28+
{
29+
}
2830
}
2931

3032
?>

‎src/Symfony/Component/Dotenv/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016-present Fabien Potencier
1+
Copyright (c) 2016-2018 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcacheSessionHandler.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class MemcacheSessionHandler implements \SessionHandlerInterface
2929
private $prefix;
3030

3131
/**
32+
* Constructor.
33+
*
3234
* List of available options:
3335
* * prefix: The prefix to use for the memcache keys in order to avoid collision
3436
* * expiretime: The time to live in seconds

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ class MemcachedSessionHandler implements \SessionHandlerInterface
3434
private $prefix;
3535

3636
/**
37+
* Constructor.
38+
*
3739
* List of available options:
3840
* * prefix: The prefix to use for the memcached keys in order to avoid collision
3941
* * expiretime: The time to live in seconds

‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class MongoDbSessionHandler implements \SessionHandlerInterface
2929
private $options;
3030

3131
/**
32+
* Constructor.
33+
*
3234
* List of available options:
3335
* * database: The name of the database [required]
3436
* * collection: The name of the collection [required]

‎src/Symfony/Component/HttpKernel/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*
2626
* @author Fabien Potencier <fabien@symfony.com>
2727
*
28-
* @method Request|null getRequest() A Request instance
28+
* @method Request|null getRequest() A Request instance
2929
* @method Response|null getResponse() A Response instance
3030
*/
3131
class Client extends BaseClient

‎src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
3636
private $traces = array();
3737

3838
/**
39+
* Constructor.
40+
*
3941
* The available options are:
4042
*
4143
* * debug: If true, the traces are added as a HTTP header to ease debugging

‎src/Symfony/Component/Inflector/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012-present Fabien Potencier
1+
Copyright (c) 2012-2018 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/PropertyInfo/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015-present Fabien Potencier
1+
Copyright (c) 2015-2018 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/Routing/Route.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ class Route implements \Serializable
3434
private $compiled;
3535

3636
/**
37+
* Constructor.
38+
*
3739
* Available options:
3840
*
3941
* * compiler_class: A class name able to compile this route instance (RouteCompiler by default)

‎src/Symfony/Component/Security/Guard/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-present Fabien Potencier
1+
Copyright (c) 2004-2018 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php

Lines changed: 3 additions & 0 deletions
16
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Component\Validator\Constraints\Callback;
1515
use Symfony\Component\Validator\Constraints\Collection;
+
use Symfony\Component\Validator\Constraints\Expression;
1617
use Symfony\Component\Validator\Constraints\GroupSequence;
1718
use Symfony\Component\Validator\Constraints\NotNull;
1819
use Symfony\Component\Validator\Constraints\Traverse;
@@ -580,6 +581,7 @@ public function testAccessCurrentObject()
580581
$called = false;
581582
$entity = new Entity();
582583
$entity->firstName = 'Bernhard';
584+
$entity->data = array('firstName' => 'Bernhard');
583585

584586
$callback = function ($value, ExecutionContextInterface $context) use ($entity, &$called) {
585587
$called = true;
@@ -588,6 +590,7 @@ public function testAccessCurrentObject()
588590

589591
$this->metadata->addConstraint(new Callback($callback));
590592
$this->metadata->addPropertyConstraint('firstName', new Callback($callback));
593+
$this->metadata->addPropertyConstraint('data', new Collection(array('firstName' => new Expression('value == this.firstName'))));
591594

592595
$this->validator->validate($entity);
593596

‎src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function validate($value, $constraints = null, $groups = null)
108108

109109
$this->validateGenericNode(
110110
$value,
111-
null,
111+
$previousObject,
112112
is_object($value) ? spl_object_hash($value) : null,
113113
$metadata,
114114
$this->defaultPropertyPath,

‎src/Symfony/Component/VarDumper/VarDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static function dump($var)
2929
{
3030
if (null === self::$handler) {
3131
$cloner = new VarCloner();
32-
$dumper = 'cli' === PHP_SAPI ? new CliDumper() : new HtmlDumper();
32+
$dumper = in_array(PHP_SAPI, array('cli', 'phpdbg')) ? new CliDumper() : new HtmlDumper();
3333
self::$handler = function ($var) use ($cloner, $dumper) {
3434
$dumper->dump($cloner->cloneVar($var));
3535
};

‎src/Symfony/Component/Workflow/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014-present Fabien Potencier
1+
Copyright (c) 2014-2018 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)
0