Skip to content

Commit

Permalink
Merge branch '3.4' into 4.3
Browse files Browse the repository at this point in the history
* 3.4:
  #32853 Check if $this->parameters is array.
  [Validator] Improve Fa translations
  • Loading branch information
nicolas-grekas committed Aug 3, 2019
2 parents 07bade0 + 8890be6 commit c7afa28
Show file tree
Hide file tree
Showing 47 changed files with 62 additions and 62 deletions.
Expand Up @@ -1001,7 +1001,7 @@ private function startClass(string $class, string $baseClass, string $baseClassW
*/
class $class extends $baseClass
{
private \$parameters;
private \$parameters = [];
private \$targetDirs = [];
public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_Aliases_Deprecation extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -18,7 +18,7 @@
*/
class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithoutArgumentsContainer
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -18,7 +18,7 @@
*/
class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithMandatoryArgumentsContainer
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -18,7 +18,7 @@
*/
class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\ConstructorWithOptionalArgumentsContainer
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -18,7 +18,7 @@
*/
class ProjectServiceContainer extends \Symfony\Component\DependencyInjection\Tests\Fixtures\Container\NoConstructorContainer
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -18,7 +18,7 @@
*/
class Container extends \Symfony\Component\DependencyInjection\Dump\AbstractContainer
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_EnvParameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -373,7 +373,7 @@ class ProjectServiceContainer extends Container
{
private $buildParameters;
private $containerDir;
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct(array $buildParameters = [], $containerDir = __DIR__)
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_CsvParameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_Deep_Graph extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_DefaultParameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Errored_Definition extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_Inline_Self_Ref extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_JsonParameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -45,7 +45,7 @@ class ProjectServiceContainer extends Container
{
private $buildParameters;
private $containerDir;
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct(array $buildParameters = [], $containerDir = __DIR__)
Expand Down Expand Up @@ -107,4 +107,4 @@ return new \Container%s\ProjectServiceContainer([
'container.build_time' => %d,
], __DIR__.\DIRECTORY_SEPARATOR.'Container%s');

)
)
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_QueryStringParameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
private $getService;

Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Service_Locator_Argument extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
private $getService;

Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
private $getService;

Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down
Expand Up @@ -16,7 +16,7 @@
*/
class Symfony_DI_PhpDumper_Test_Uninitialized_Reference extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];

public function __construct()
Expand Down

0 comments on commit c7afa28

Please sign in to comment.