Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit b68c08c59417 · 2023-07-25T11:50:29.000+02:00
* 6.4:
  Use typed properties in tests as much as possible
diff --git a/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php b/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
@@ -25,15 +25,8 @@ class BundleEntryReaderTest extends TestCase
 {
     private const RES_DIR = '/res/dir';
 
-    /**
-     * @var BundleEntryReader
-     */
-    private $reader;
-
-    /**
-     * @var MockObject&BundleEntryReaderInterface
-     */
-    private $readerImpl;
+    private BundleEntryReader $reader;
+    private MockObject&BundleEntryReaderInterface $readerImpl;
 
     private const DATA = [
         'Entries' => [
diff --git a/Tests/Data/Bundle/Reader/IntlBundleReaderTest.php b/Tests/Data/Bundle/Reader/IntlBundleReaderTest.php
@@ -23,10 +23,7 @@
  */
 class IntlBundleReaderTest extends TestCase
 {
-    /**
-     * @var IntlBundleReader
-     */
-    private $reader;
+    private IntlBundleReader $reader;
 
     protected function setUp(): void
     {
diff --git a/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php b/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php
@@ -21,10 +21,7 @@
  */
 class JsonBundleReaderTest extends TestCase
 {
-    /**
-     * @var JsonBundleReader
-     */
-    private $reader;
+    private JsonBundleReader $reader;
 
     protected function setUp(): void
     {
diff --git a/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php b/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php
@@ -21,10 +21,7 @@
  */
 class PhpBundleReaderTest extends TestCase
 {
-    /**
-     * @var PhpBundleReader
-     */
-    private $reader;
+    private PhpBundleReader $reader;
 
     protected function setUp(): void
     {
diff --git a/Tests/Data/Bundle/Writer/JsonBundleWriterTest.php b/Tests/Data/Bundle/Writer/JsonBundleWriterTest.php
@@ -20,17 +20,9 @@
  */
 class JsonBundleWriterTest extends TestCase
 {
-    /**
-     * @var JsonBundleWriter
-     */
-    private $writer;
-
-    private $directory;
-
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
+    private JsonBundleWriter $writer;
+    private string $directory;
+    private Filesystem $filesystem;
 
     protected function setUp(): void
     {
diff --git a/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php b/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php
@@ -20,17 +20,9 @@
  */
 class PhpBundleWriterTest extends TestCase
 {
-    /**
-     * @var PhpBundleWriter
-     */
-    private $writer;
-
-    private $directory;
-
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
+    private PhpBundleWriter $writer;
+    private string $directory;
+    private Filesystem $filesystem;
 
     protected function setUp(): void
     {
diff --git a/Tests/Data/Bundle/Writer/TextBundleWriterTest.php b/Tests/Data/Bundle/Writer/TextBundleWriterTest.php
@@ -22,17 +22,9 @@
  */
 class TextBundleWriterTest extends TestCase
 {
-    /**
-     * @var TextBundleWriter
-     */
-    private $writer;
-
-    private $directory;
-
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
+    private TextBundleWriter $writer;
+    private string $directory;
+    private Filesystem $filesystem;
 
     protected function setUp(): void
     {
diff --git a/Tests/Data/Util/LocaleScannerTest.php b/Tests/Data/Util/LocaleScannerTest.php
@@ -20,17 +20,9 @@
  */
 class LocaleScannerTest extends TestCase
 {
-    private $directory;
-
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
-
-    /**
-     * @var LocaleScanner
-     */
-    private $scanner;
+    private string $directory;
+    private Filesystem $filesystem;
+    private LocaleScanner $scanner;
 
     protected function setUp(): void
     {
diff --git a/Tests/Data/Util/RingBufferTest.php b/Tests/Data/Util/RingBufferTest.php
@@ -20,10 +20,7 @@
  */
 class RingBufferTest extends TestCase
 {
-    /**
-     * @var RingBuffer
-     */
-    private $buffer;
+    private RingBuffer $buffer;
 
     protected function setUp(): void
     {
diff --git a/Tests/IntlTest.php b/Tests/IntlTest.php
@@ -16,7 +16,7 @@
 
 class IntlTest extends TestCase
 {
-    private $defaultLocale;
+    private string $defaultLocale;
 
     protected function setUp(): void
     {
diff --git a/Tests/ResourceBundleTestCase.php b/Tests/ResourceBundleTestCase.php
@@ -734,8 +734,8 @@ abstract class ResourceBundleTestCase extends TestCase
         'zh_TW' => 'zh_Hant_TW',
     ];
 
-    private static $rootLocales;
-    private $defaultLocale;
+    private static ?array $rootLocales = null;
+    private string $defaultLocale;
 
     protected function setUp(): void
     {
diff --git a/Tests/ScriptsTest.php b/Tests/ScriptsTest.php
@@ -21,7 +21,7 @@ class ScriptsTest extends ResourceBundleTestCase
 {
     // The below arrays document the state of the ICU data bundled with this package.
 
-    protected static $scripts = [
+    protected static array $scripts = [
         'Adlm',
         'Afak',
         'Aghb',
diff --git a/Tests/Util/GitRepositoryTest.php b/Tests/Util/GitRepositoryTest.php
@@ -21,7 +21,7 @@
  */
 class GitRepositoryTest extends TestCase
 {
-    private $targetDir;
+    private ?string $targetDir = null;
 
     private const REPO_URL = 'https://github.com/symfony/intl.git';
 

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,7 @@`
`23`	`23`	`*/`
`24`	`24`	`class IntlBundleReaderTest extends TestCase`
`25`	`25`	`{`
`26`		`- /**`
`27`		`- * @var IntlBundleReader`
`28`		`- */`
`29`		`- private $reader;`
	`26`	`+ private IntlBundleReader $reader;`
`30`	`27`
`31`	`28`	`protected function setUp(): void`
`32`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`class JsonBundleReaderTest extends TestCase`
`23`	`23`	`{`
`24`		`- /**`
`25`		`- * @var JsonBundleReader`
`26`		`- */`
`27`		`- private $reader;`
	`24`	`+ private JsonBundleReader $reader;`
`28`	`25`
`29`	`26`	`protected function setUp(): void`
`30`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`class RingBufferTest extends TestCase`
`22`	`22`	`{`
`23`		`- /**`
`24`		`- * @var RingBuffer`
`25`		`- */`
`26`		`- private $buffer;`
	`23`	`+ private RingBuffer $buffer;`
`27`	`24`
`28`	`25`	`protected function setUp(): void`
`29`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`class IntlTest extends TestCase`
`18`	`18`	`{`
`19`		`- private $defaultLocale;`
	`19`	`+ private string $defaultLocale;`
`20`	`20`
`21`	`21`	`protected function setUp(): void`
`22`	`22`	`{`