diff --git a/src/Symfony/Component/BrowserKit/Client.php b/src/Symfony/Component/BrowserKit/Client.php
index b20ccdc88c29b..815a4d3fd2b9d 100644
--- a/src/Symfony/Component/BrowserKit/Client.php
+++ b/src/Symfony/Component/BrowserKit/Client.php
@@ -457,7 +457,7 @@ protected function doRequestInProcess($request)
foreach ($deprecations ? unserialize($deprecations) : [] as $deprecation) {
if ($deprecation[0]) {
// unsilenced on purpose
- trigger_error($deprecation[1], \E_USER_DEPRECATED);
+ @trigger_error($deprecation[1], \E_USER_DEPRECATED);
} else {
@trigger_error($deprecation[1], \E_USER_DEPRECATED);
}
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
index d5156ad5f73fe..fb32a059d20b7 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -25,14 +25,13 @@
*/
abstract class AbstractAdapter implements AdapterInterface, CacheInterface, LoggerAwareInterface, ResettableInterface
{
+ use AbstractAdapterTrait;
+ use ContractsTrait;
/**
* @internal
*/
protected const NS_SEPARATOR = ':';
- use AbstractAdapterTrait;
- use ContractsTrait;
-
private static $apcuSupported;
private static $phpFilesSupported;
diff --git a/src/Symfony/Component/Cache/Adapter/Psr16Adapter.php b/src/Symfony/Component/Cache/Adapter/Psr16Adapter.php
index 4cbe35c43f1ff..45a777bf72a1f 100644
--- a/src/Symfony/Component/Cache/Adapter/Psr16Adapter.php
+++ b/src/Symfony/Component/Cache/Adapter/Psr16Adapter.php
@@ -23,13 +23,12 @@
*/
class Psr16Adapter extends AbstractAdapter implements PruneableInterface, ResettableInterface
{
+ use ProxyTrait;
/**
* @internal
*/
protected const NS_SEPARATOR = '_';
- use ProxyTrait;
-
private $miss;
public function __construct(CacheInterface $pool, string $namespace = '', int $defaultLifetime = 0)
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
index 9d5fefa4fb40b..6966ccfdf017d 100644
--- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -25,10 +25,9 @@
*/
class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterface, PruneableInterface, ResettableInterface
{
- public const TAGS_PREFIX = "\0tags\0";
-
use ContractsTrait;
use ProxyTrait;
+ public const TAGS_PREFIX = "\0tags\0";
private $deferred = [];
private $createCacheItem;
diff --git a/src/Symfony/Component/Cache/Simple/AbstractCache.php b/src/Symfony/Component/Cache/Simple/AbstractCache.php
index b0488075918e4..c638652ace986 100644
--- a/src/Symfony/Component/Cache/Simple/AbstractCache.php
+++ b/src/Symfony/Component/Cache/Simple/AbstractCache.php
@@ -27,16 +27,15 @@
*/
abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterface, ResettableInterface
{
- /**
- * @internal
- */
- protected const NS_SEPARATOR = ':';
-
use AbstractTrait {
deleteItems as private;
AbstractTrait::deleteItem as delete;
AbstractTrait::hasItem as has;
}
+ /**
+ * @internal
+ */
+ protected const NS_SEPARATOR = ':';
private $defaultLifetime;
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
index d293697d422c5..43e8a9b749dc9 100644
--- a/src/Symfony/Component/Console/Tests/ApplicationTest.php
+++ b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -501,12 +501,12 @@ public function testDontRunAlternativeNamespaceName()
$tester = new ApplicationTester($application);
$tester->run(['command' => 'foos:bar1'], ['decorated' => false]);
$this->assertSame('
-
- There are no commands defined in the "foos" namespace.
-
- Did you mean this?
- foo
-
+
+ There are no commands defined in the "foos" namespace.
+
+ Did you mean this?
+ foo
+
', $tester->getDisplay(true));
}
diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
index d02d6ea42e30d..7ce367654c55c 100644
--- a/src/Symfony/Component/Console/Tests/Helper/TableTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -118,11 +118,11 @@ public function renderProvider()
$books,
'compact',
<<<'TABLE'
- ISBN Title Author
- 99921-58-10-7 Divine Comedy Dante Alighieri
- 9971-5-0210-0 A Tale of Two Cities Charles Dickens
- 960-425-059-0 The Lord of the Rings J. R. R. Tolkien
- 80-902734-1-6 And Then There Were None Agatha Christie
+ ISBN Title Author
+ 99921-58-10-7 Divine Comedy Dante Alighieri
+ 9971-5-0210-0 A Tale of Two Cities Charles Dickens
+ 960-425-059-0 The Lord of the Rings J. R. R. Tolkien
+ 80-902734-1-6 And Then There Were None Agatha Christie
TABLE
],
@@ -131,14 +131,14 @@ public function renderProvider()
$books,
'borderless',
<<<'TABLE'
- =============== ========================== ==================
- ISBN Title Author
- =============== ========================== ==================
- 99921-58-10-7 Divine Comedy Dante Alighieri
- 9971-5-0210-0 A Tale of Two Cities Charles Dickens
- 960-425-059-0 The Lord of the Rings J. R. R. Tolkien
- 80-902734-1-6 And Then There Were None Agatha Christie
- =============== ========================== ==================
+ =============== ========================== ==================
+ ISBN Title Author
+ =============== ========================== ==================
+ 99921-58-10-7 Divine Comedy Dante Alighieri
+ 9971-5-0210-0 A Tale of Two Cities Charles Dickens
+ 960-425-059-0 The Lord of the Rings J. R. R. Tolkien
+ 80-902734-1-6 And Then There Were None Agatha Christie
+ =============== ========================== ==================
TABLE
],
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AliasConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AliasConfigurator.php
index c77653c74494a..6511b59b2b6a5 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AliasConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AliasConfigurator.php
@@ -18,10 +18,9 @@
*/
class AliasConfigurator extends AbstractServiceConfigurator
{
- public const FACTORY = 'alias';
-
use Traits\DeprecateTrait;
use Traits\PublicTrait;
+ public const FACTORY = 'alias';
public function __construct(ServicesConfigurator $parent, Alias $alias)
{
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php
index c80bc1fd0caeb..f513e7418288f 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/DefaultsConfigurator.php
@@ -19,12 +19,11 @@
*/
class DefaultsConfigurator extends AbstractServiceConfigurator
{
- public const FACTORY = 'defaults';
-
use Traits\AutoconfigureTrait;
use Traits\AutowireTrait;
use Traits\BindTrait;
use Traits\PublicTrait;
+ public const FACTORY = 'defaults';
private $path;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php
index 594d5ea3a0148..cabf90c428177 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php
@@ -18,8 +18,6 @@
*/
class InlineServiceConfigurator extends AbstractConfigurator
{
- public const FACTORY = 'inline';
-
use Traits\ArgumentTrait;
use Traits\AutowireTrait;
use Traits\BindTrait;
@@ -28,6 +26,7 @@ class InlineServiceConfigurator extends AbstractConfigurator
use Traits\LazyTrait;
use Traits\ParentTrait;
use Traits\TagTrait;
+ public const FACTORY = 'inline';
private $id = '[inline]';
private $allowParent = true;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php
index dba8b43e92c09..a81b35038a6b6 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InstanceofConfigurator.php
@@ -18,8 +18,6 @@
*/
class InstanceofConfigurator extends AbstractServiceConfigurator
{
- public const FACTORY = 'instanceof';
-
use Traits\AutowireTrait;
use Traits\BindTrait;
use Traits\CallTrait;
@@ -29,6 +27,7 @@ class InstanceofConfigurator extends AbstractServiceConfigurator
use Traits\PublicTrait;
use Traits\ShareTrait;
use Traits\TagTrait;
+ public const FACTORY = 'instanceof';
private $path;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
index 43b154907f90a..cbeb8573f64a7 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php
@@ -19,8 +19,6 @@
*/
class PrototypeConfigurator extends AbstractServiceConfigurator
{
- public const FACTORY = 'load';
-
use Traits\AbstractTrait;
use Traits\ArgumentTrait;
use Traits\AutoconfigureTrait;
@@ -36,6 +34,7 @@ class PrototypeConfigurator extends AbstractServiceConfigurator
use Traits\PublicTrait;
use Traits\ShareTrait;
use Traits\TagTrait;
+ public const FACTORY = 'load';
private $loader;
private $resource;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
index b097bbc220a3a..93acc171af22d 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
@@ -20,8 +20,6 @@
*/
class ServiceConfigurator extends AbstractServiceConfigurator
{
- public const FACTORY = 'services';
-
use Traits\AbstractTrait;
use Traits\ArgumentTrait;
use Traits\AutoconfigureTrait;
@@ -41,6 +39,7 @@ class ServiceConfigurator extends AbstractServiceConfigurator
use Traits\ShareTrait;
use Traits\SyntheticTrait;
use Traits\TagTrait;
+ public const FACTORY = 'services';
private $container;
private $instanceof;
diff --git a/src/Symfony/Component/ErrorHandler/Resources/assets/images/symfony-ghost.svg.php b/src/Symfony/Component/ErrorHandler/Resources/assets/images/symfony-ghost.svg.php
index 4b2f9c1b9b1d9..8d14f811ac1c9 100644
--- a/src/Symfony/Component/ErrorHandler/Resources/assets/images/symfony-ghost.svg.php
+++ b/src/Symfony/Component/ErrorHandler/Resources/assets/images/symfony-ghost.svg.php
@@ -1 +1 @@
-
+
diff --git a/src/Symfony/Component/ErrorHandler/Resources/views/error.html.php b/src/Symfony/Component/ErrorHandler/Resources/views/error.html.php
index 5416d03c8c159..43aa2310d51ec 100644
--- a/src/Symfony/Component/ErrorHandler/Resources/views/error.html.php
+++ b/src/Symfony/Component/ErrorHandler/Resources/views/error.html.php
@@ -1,15 +1,15 @@
-
+
- An Error Occurred: = $statusText; ?>
-
+ An Error Occurred:
+
Oops! An Error Occurred
-
The server returned a "= $statusCode; ?> = $statusText; ?>".
+
The server returned a " ".
Something is broken. Please let us know what you were doing when this error occurred.
diff --git a/src/Symfony/Component/ErrorHandler/Resources/views/exception.html.php b/src/Symfony/Component/ErrorHandler/Resources/views/exception.html.php
index c3e7a8674e743..f5617149bbc75 100644
--- a/src/Symfony/Component/ErrorHandler/Resources/views/exception.html.php
+++ b/src/Symfony/Component/ErrorHandler/Resources/views/exception.html.php
@@ -1,25 +1,25 @@
-
- You're seeing this page because you haven't configured any homepage URL and debug mode is enabled.
+ You're seeing this page because you haven't configured any homepage URL and debug mode is enabled.
-
+
-
Welcome to Symfony = $version; ?>
+
Welcome to Symfony
@@ -81,12 +81,12 @@
- = $projectDir; ?>
+
Your application is now ready and you can start working on it.