Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Validator] Docblock about throwing a validator Exception #29832

Merged
merged 1 commit into from Feb 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 17 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Expand Up @@ -2,6 +2,23 @@
/src/Symfony/Component/Console/Logger/ConsoleLogger.php @dunglas
# DependencyInjection
/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php @dunglas
# Form
/src/Symfony/Bridge/Twig/Extension/FormExtension.php @xabbuh
/src/Symfony/Bridge/Twig/Form/* @xabbuh
/src/Symfony/Bridge/Twig/Node/FormThemeNode.php @xabbuh
/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php @xabbuh
/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php @xabbuh
/src/Symfony/Bridge/Twig/Tests/Extension/FormExtension* @xabbuh
/src/Symfony/Bridge/Twig/Tests/Node/FormThemeTest.php @xabbuh
/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php @xabbuh
/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php @xabbuh
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php @xabbuh
/src/Symfony/Bundle/FrameworkBundle/Resources/views/* @xabbuh
/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @xabbuh
/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php @xabbuh
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php @xabbuh
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php @xabbuh
/src/Symfony/Component/Form/* @xabbuh
# HttpKernel
/src/Symfony/Component/HttpKernel/Log/Logger.php @dunglas
# LDAP
Expand Down
16 changes: 8 additions & 8 deletions .php_cs.dist
Expand Up @@ -5,26 +5,26 @@ if (!file_exists(__DIR__.'/src')) {
}

return PhpCsFixer\Config::create()
->setRules(array(
->setRules([
'@Symfony' => true,
'@Symfony:risky' => true,
'@PHPUnit48Migration:risky' => true,
'php_unit_no_expectation_annotation' => false, // part of `PHPUnitXYMigration:risky` ruleset, to be enabled when PHPUnit 4.x support will be dropped, as we don't want to rewrite exceptions handling twice
'array_syntax' => array('syntax' => 'short'),
'array_syntax' => ['syntax' => 'short'],
'fopen_flags' => false,
'ordered_imports' => true,
'protected_to_private' => false,
// Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading
'native_function_invocation' => array('include' => array('@compiler_optimized'), 'scope' => 'namespaced'),
'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced'],
// Part of future @Symfony ruleset in PHP-CS-Fixer To be removed from the config file once upgrading
'phpdoc_types_order' => array('null_adjustment' => 'always_last', 'sort_algorithm' => 'none'),
))
'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
])
->setRiskyAllowed(true)
->setFinder(
PhpCsFixer\Finder::create()
->in(__DIR__.'/src')
->append(array(__FILE__))
->exclude(array(
->append([__FILE__])
->exclude([
// directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
'Symfony/Component/DependencyInjection/Tests/Fixtures',
'Symfony/Component/Routing/Tests/Fixtures/dumper',
Expand All @@ -38,7 +38,7 @@ return PhpCsFixer\Config::create()
'Symfony/Bundle/FrameworkBundle/Resources/views/Form',
// explicit trigger_error tests
'Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/',
))
])
// Support for older PHPunit version
->notPath('Symfony/Bridge/PhpUnit/SymfonyTestsListener.php')
// file content autogenerated by `var_export`
Expand Down
17 changes: 11 additions & 6 deletions .travis.yml
Expand Up @@ -11,6 +11,7 @@ addons:
- language-pack-fr-base
- ldap-utils
- slapd
- libsasl2-dev

env:
global:
Expand All @@ -23,10 +24,10 @@ matrix:
sudo: required
group: edge
- php: 5.5
env: php_extra="5.6 7.0"
- php: 7.1
env: deps=high
env: php_extra="5.6 7.0 7.1"
- php: 7.2
env: deps=high
- php: 7.3
env: deps=low
fast_finish: true

Expand All @@ -43,6 +44,12 @@ services:
- docker

before_install:
- |
# Enable Sury ppa
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
sudo add-apt-repository -y ppa:ondrej/php
sudo apt update

- |
# Start Redis cluster
docker pull grokzen/redis-cluster:4.0.8
Expand Down Expand Up @@ -174,13 +181,11 @@ before_install:
elif [[ $PHP = 7.* ]]; then
if ! php --ri sodium > /dev/null; then
# install libsodium
sudo add-apt-repository ppa:ondrej/php -y
sudo apt-get update -q
sudo apt-get install libsodium-dev -y
tfold ext.libsodium tpecl libsodium sodium.so $INI
fi

tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
tfold ext.apcu tpecl apcu-5.1.16 apcu.so $INI
tfold ext.mongodb tpecl mongodb-1.6.0alpha1 mongodb.so $INI
fi
done
Expand Down
25 changes: 25 additions & 0 deletions CHANGELOG-3.4.md
Expand Up @@ -7,6 +7,31 @@ in 3.4 minor versions.
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.4.0...v3.4.1

* 3.4.22 (2019-02-03)

* bug #30046 [DI] Fix dumping Doctrine-like service graphs (nicolas-grekas)
* bug #30028 [Form] fix some docblocks and type checks (xabbuh)
* bug #30037 Disable Twig in the profiler menu when Twig is not used (javiereguiluz)
* bug #30026 [VarDumper] dont implement Serializable in Stub (nicolas-grekas)
* bug #30034 [Config] ensure moving away from Serializable wont break cache:clear (nicolas-grekas)
* bug #30006 [Security] don't do nested calls to serialize() (nicolas-grekas, Renan)
* bug #30007 [FrameworkBundle] Support use of hyphen in asset package name (damaya, XuruDragon)
* bug #29764 [HttpFoundation] Check file exists before unlink (adam-mospan)
* bug #29783 [HttpFoundation] MemcachedSessionHandler::close() must close connection (grachevko)
* bug #29844 [Console] Fixed #29835: ConfirmationQuestion with default true for answer '0' (mrthehud)
* bug #29869 [Debug][ErrorHandler] Preserve our error handler when a logger sets another one (fancyweb)
* bug #29926 [Form] Changed UrlType input type to text when default_protocol is not null (MatTheCat)
* bug #29961 [Translation] Concatenated translation messages (Stadly)
* bug #29920 [Debug][DebugClassLoader] Match more cases for final, deprecated and internal classes / methods extends (fancyweb)
* bug #29863 [Security] Do not mix password_*() API with libsodium one (chalasr)
* bug #29894 [DependencyInjection] the string "0" is a valid service identifier (xabbuh)
* bug #29885 Update MimeType extensions (fabpot)
* bug #29875 [TwigBridge] fix compatibility with Twig >= 2.6.1 (xabbuh)
* bug #29873 [Debug] remove return type hint for PHP 5 compatibility (xabbuh)
* bug #29837 Fix SwiftMailerHandler to support Monolog's latest reset functionality (Seldaek)
* bug #29853 Revert "bug #29597 [DI] fix reporting bindings on overriden services as unused" (mmarynich)
* bug #29833 [DebugClassLoader] expose proxyfied findFile() method (fancyweb)

* 3.4.21 (2019-01-06)

* bug #29494 [HttpFoundation] Fix request uri when it starts with double slashes (alquerci)
Expand Down