Merge branch '3.4' into 4.3

* 3.4:
  #32853 Check if $this->parameters is array.
  [Validator] Improve Fa translations
This commit is contained in:
Nicolas Grekas 2019-08-03 20:28:12 +02:00
commit c7afa28b6b
47 changed files with 62 additions and 62 deletions

View File

@ -1001,7 +1001,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class $class extends $baseClass
{
private \$parameters;
private \$parameters = [];
private \$targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Aliases_Deprecation extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_EnvParameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -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__)

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Almost_Circular_Private extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Almost_Circular_Public extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Base64Parameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_CsvParameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Deep_Graph extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_DefaultParameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Errored_Definition extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Inline_Self_Ref extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_JsonParameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -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__)
@ -107,4 +107,4 @@ return new \Container%s\ProjectServiceContainer([
'container.build_time' => %d,
], __DIR__.\DIRECTORY_SEPARATOR.'Container%s');
)
)

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_QueryStringParameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Rot13Parameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
private $getService;

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Service_Locator_Argument extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
private $getService;

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
private $getService;

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class ProjectServiceContainer extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Uninitialized_Reference extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_Unsupported_Characters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Test_UrlParameters extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
*/
class Symfony_DI_PhpDumper_Service_Wither extends Container
{
private $parameters;
private $parameters = [];
private $targetDirs = [];
public function __construct()

View File

@ -36,7 +36,7 @@
</trans-unit>
<trans-unit id="9">
<source>The fields {{ fields }} were not expected.</source>
<target>فیلدهای {{ fields }} اضافی هستند.</target>
<target>فیلدهای {{ fields }} شامل فیلدهای مورد انتظار نمی باشند.</target>
</trans-unit>
<trans-unit id="10">
<source>The fields {{ fields }} are missing.</source>
@ -60,7 +60,7 @@
</trans-unit>
<trans-unit id="15">
<source>The file is not readable.</source>
<target>فایل قابلیت خوانده شدن ندارد.</target>
<target>پرونده خواندنی نمی باشد.</target>
</trans-unit>
<trans-unit id="16">
<source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source>
@ -160,19 +160,19 @@
</trans-unit>
<trans-unit id="43">
<source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
<target>طول تصویر بسیار بزرگ است ({{ width }}px). بشینه طول مجاز {{ max_width }}px می باشد.</target>
<target>طول تصویر بسیار بزرگ است({{ width }}px). بیشینه طول مجاز {{ max_width }}px می باشد.</target>
</trans-unit>
<trans-unit id="44">
<source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
<target>طول تصویر بسیار کوچک است ({{ width }}px). کمینه طول موردنظر {{ min_width }}px می باشد.</target>
<target>طول تصویر بسیار کوچک است({{ width }}px). کمینه طول موردنظر {{ min_width }}px می باشد.</target>
</trans-unit>
<trans-unit id="45">
<source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
<target>ارتفاع تصویر بسیار بزرگ است ({{ height }}px). بشینه ارتفاع مجاز {{ max_height }}px می باشد.</target>
<target>ارتفاع تصویر بسیار بزرگ است({{ height }}px). بیشینه ارتفاع مجاز {{ max_height }}px می باشد.</target>
</trans-unit>
<trans-unit id="46">
<source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
<target>ارتفاع تصویر بسیار کوچک است ({{ height }}px). کمینه ارتفاع موردنظر {{ min_height }}px می باشد.</target>
<target>ارتفاع تصویر بسیار کوچک است({{ height }}px). کمینه ارتفاع موردنظر {{ min_height }}px می باشد.</target>
</trans-unit>
<trans-unit id="47">
<source>This value should be the user's current password.</source>
@ -192,7 +192,7 @@
</trans-unit>
<trans-unit id="51">
<source>No temporary folder was configured in php.ini.</source>
<target>فولدر موقت در php.ini پیکربندی نگردیده است.</target>
<target>پوشه موقتی در php.ini پیکربندی نگردیده است.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
@ -224,7 +224,7 @@
</trans-unit>
<trans-unit id="59">
<source>This is not a valid International Bank Account Number (IBAN).</source>
<target>این یک شماره حساب بانک بین المللی معتبر نمی باشد (IBAN).</target>
<target>این یک شماره حساب بانک بین المللی معتبر نمی باشد(IBAN).</target>
</trans-unit>
<trans-unit id="60">
<source>This value is not a valid ISBN-10.</source>
@ -280,23 +280,23 @@
</trans-unit>
<trans-unit id="73">
<source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source>
<target>ابعاد {{ ratio }} عکس بیش از حد بزرگ است.حداکثر ابعاد مجاز {{ max_ratio }} می باشد.</target>
<target>ابعاد({{ ratio }}) عکس بیش از حد بزرگ است.حداکثر ابعاد مجاز {{ max_ratio }} می باشد.</target>
</trans-unit>
<trans-unit id="74">
<source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source>
<target>ابعاد {{ ratio }} عکس بیش از حد کوچک است.حداقل ابعاد مجاز {{ min_ratio }} می باشد.</target>
<target>ابعاد({{ ratio }}) عکس بیش از حد کوچک است.حداقل ابعاد مجاز {{ min_ratio }} می باشد.</target>
</trans-unit>
<trans-unit id="75">
<source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source>
<target>این تصویر یک مربع width }}x{{ height }}px}} می باشد.تصویر مربع مجاز نمی باشد.</target>
<target>این تصویر یک مربع({{ width }}x{{ height }}px) می باشد. تصویر مربع مجاز نمی باشد.</target>
</trans-unit>
<trans-unit id="76">
<source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source>
<target>این تصویر افقی width }}x{{ height }}px}} می باشد.تصویر افقی مجاز نمی باشد.</target>
<target>این تصویر افقی({{ width }}x{{ height }}px) می باشد. تصویر افقی مجاز نمی باشد.</target>
</trans-unit>
<trans-unit id="77">
<source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source>
<target>این تصویر عمودی width }}x{{ height }}px}} می باشد.تصویر عمودی مجاز نمی باشد.</target>
<target>این تصویر عمودی({{ width }}x{{ height }}px) می باشد. تصویر عمودی مجاز نمی باشد.</target>
</trans-unit>
<trans-unit id="78">
<source>An empty file is not allowed.</source>
@ -312,7 +312,7 @@
</trans-unit>
<trans-unit id="81">
<source>This is not a valid Business Identifier Code (BIC).</source>
<target>این مقدار یک BIC معتبر نمی باشد.</target>
<target>این مقدار یک(BIC) معتبر نمی باشد.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
@ -328,7 +328,7 @@
</trans-unit>
<trans-unit id="85">
<source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source>
<target>این BIC با IBAN ارتباطی ندارد.</target>
<target>این(BIC) با IBAN ارتباطی ندارد.</target>
</trans-unit>
</body>
</file>