8000 Merge branch '3.4' into 4.3 · symfony/symfony@a56c3ef · GitHub
[go: up one dir, main page]
Skip to content

Commit a56c3ef

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.3
* 3.4: Update links to documentation [Validator] Add the missing translations for the Arabic (ar) locale ensure to expect no validation for the right reasons [PhpUnitBridge] Add test case for @expectedDeprecation annotation Update year in license files [Console][FormatterHelper] Use helper strlen statically and remove duplicated code Fix BC issue in phpDoc Reflection library [Translator] Performance improvement in MessageCatalogue and catalogue operations.
2 parents db874f6 + 4b419f2 commit a56c3ef

File tree

77 files changed

+183
-81
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+183
-81
lines changed

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Bridge/Doctrine/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Bridge/Monolog/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Bridge/PhpUnit/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014-2019 Fabien Potencier
1+
Copyright (c) 2014-2020 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/Bridge/PhpUnit/Tests/ExpectedDeprecationAnnotationTest.php

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Bridge\PhpUnit\Tests;
13+
14+
use PHPUnit\Framework\TestCase;
15+
16+
final class ExpectedDeprecationAnnotationTest extends TestCase
17+
{
18+
/**
19+
* Do not remove this test in the next major versions.
20+
*
21+
* @group legacy
22+
*
23+
* @expectedDeprecation foo
24+
*/
25+
public function testOne()
26+
{
27+
@trigger_error('foo', E_USER_DEPRECATED);
28+
}
29+
30+
/**
31+
* Do not remove this test in the next major versions.
32+
*
33+
* @group legacy
34+
*
35+
* @expectedDeprecation foo
36+
* @expectedDeprecation bar
37+
*/
38+
public function testMany()
39+
{
40+
@trigger_error('foo', E_USER_DEPRECATED);
41+
@trigger_error('bar', E_USER_DEPRECATED);
42+
}
43+
}

‎src/Symfony/Bridge/ProxyManager/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Bridge/Twig/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Bundle/DebugBundle/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014-2019 Fabien Potencier
1+
Copyright (c) 2014-2020 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/Bundle/FrameworkBundle/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Bundle/SecurityBundle/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Bundle/TwigBundle/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Bundle/WebProfilerBundle/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Bundle/WebServerBundle/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Asset/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/BrowserKit/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Cache/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016-2019 Fabien Potencier
1+
Copyright (c) 2016-2020 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/Config/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Config/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ may be (YAML, XML, INI files, or for instance a database).
88
Resources
99
---------
1010

11-
* [Documentation](https://symfony.com/doc/current/components/config/index.html)
11+
* [Documentation](https://symfony.com/doc/current/components/config.html)
1212
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
1313
* [Report issues](https://github.com/symfony/symfony/issues) and
1414
[send Pull Requests](https://github.com/symfony/symfony/pulls)

‎src/Symfony/Component/Console/Helper/FormatterHelper.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ public function formatBlock($messages, $style, $large = false)
5454
foreach ($messages as $message) {
5555
$message = OutputFormatter::escape($message);
5656
$lines[] = sprintf($large ? ' %s ' : ' %s ', $message);
57-
$len = max($this->strlen($message) + ($large ? 4 : 2), $len);
57+
$len = max(self::strlen($message) + ($large ? 4 : 2), $len);
5858
}
5959

6060
$messages = $large ? [str_repeat(' ', $len)] : [];
6161
for ($i = 0; isset($lines[$i]); ++$i) {
62-
$messages[] = $lines[$i].str_repeat(' ', $len - $this->strlen($lines[$i]));
62+
$messages[] = $lines[$i].str_repeat(' ', $len - self::strlen($lines[$i]));
6363
}
6464
if ($large) {
6565
$messages[] = str_repeat(' ', $len);
@@ -83,17 +83,13 @@ public function formatBlock($messages, $style, $large = false)
8383
*/
8484
public function truncate($message, $length, $suffix = '...')
8585
{
86-
$computedLength = $length - $this->strlen($suffix);
86+
$computedLength = $length - self::strlen($suffix);
8787

88-
if ($computedLength > $this->strlen($message)) {
88+
if ($computedLength > self::strlen($message)) {
8989
return $message;
9090
}
9191

92-
if (false === $encoding = mb_detect_encoding($message, null, true)) {
93-
return substr($message, 0, $length).$suffix;
94-
}
95-
96-
return mb_substr($message, 0, $length, $encoding).$suffix;
92+
return self::substr($message, 0, $length).$suffix;
9793
}
9894

9995
/**

‎src/Symfony/Component/Console/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Console/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interfaces.
77
Resources
88
---------
99

10-
* [Documentation](https://symfony.com/doc/current/components/console/index.html)
10+
* [Documentation](https://symfony.com/doc/current/components/console.html)
1111
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
1212
* [Report issues](https://github.com/symfony/symfony/issues) and
1313
[send Pull Requests](https://github.com/symfony/symfony/pulls)

‎src/Symfony/Component/CssSelector/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Debug component provides tools to ease debugging PHP code.
66
Resources
77
---------
88

9-
* [Documentation](https://symfony.com/doc/current/components/debug/index.html)
9+
* [Documentation](https://symfony.com/doc/current/components/debug.html)
1010
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
1111
* [Report issues](https://github.com/symfony/symfony/issues) and
1212
[send Pull Requests](https://github.com/symfony/symfony/pulls)

‎src/Symfony/Component/DependencyInjection/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/DependencyInjection/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ way objects are constructed in your application.
77
Resources
88
---------
99

10-
* [Documentation](https://symfony.com/doc/current/components/dependency_injection/index.html)
10+
* [Documentation](https://symfony.com/doc/current/components/dependency_injection.html)
1111
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
1212
* [Report issues](https://github.com/symfony/symfony/issues) and
1313
[send Pull Requests](https://github.com/symfony/symfony/pulls)

‎src/Symfony/Component/DomCrawler/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Dotenv/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016-2019 Fabien Potencier
1+
Copyright (c) 2016-2020 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/EventDispatcher/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/EventDispatcher/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ them.
88
Resources
99
---------
1010

11-
* [Documentation](https://symfony.com/doc/current/components/event_dispatcher/index.html)
11+
* [Documentation](https://symfony.com/doc/current/components/event_dispatcher.html)
1212
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
1313
* [Report issues](https://github.com/symfony/symfony/issues) and
1414
[send Pull Requests](https://github.com/symfony/symfony/pulls)

‎src/Symfony/Component/ExpressionLanguage/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Filesystem/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Filesystem/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Filesystem component provides basic utilities for the filesystem.
66
Resources
77
---------
88

9-
* [Documentation](https://symfony.com/doc/current/components/filesystem/index.html)
9+
* [Documentation](https://symfony.com/doc/current/components/filesystem.html)
1010
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
1111
* [Report issues](https://github.com/symfony/symfony/issues) and
1212
[send Pull Requests](https://github.com/symfony/symfony/pulls)

‎src/Symfony/Component/Finder/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Form/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 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/Form/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Form component allows you to easily create, process and reuse HTML forms.
66
Resources
77
---------
88

9-
* [Documentation](https://symfony.com/doc/current/components/form/index.html)
9+
* [Documentation](https://symfony.com/doc/current/components/form.html)
1010
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
1111
* [Report issues](https://github.com/symfony/symfony/issues) and
1212
[send Pull Requests](https://github.com/symfony/symfony/pulls)

0 commit comments

Comments
 (0)
0