Allow Symfony 7 support (#65)

* 🐛 Allow sf7 and fix tests * 🐛 Fix test
php-translation · Jan 29, 2024 · 20f9141 · 20f9141
1 parent 6983039
commit 20f9141
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -11,11 +11,11 @@
     "require": {
         "php": "^7.2 || ^8.0",
         "php-translation/common": "^3.0",
-        "symfony/translation": "^3.4 || ^4.2 || ^5.0 || ^6.0"
+        "symfony/translation": "^3.4 || ^4.2 || ^5.0 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": ">=8.5.20",
-        "symfony/framework-bundle": " ^3.4 || ^4.2 || ^5.0 || ^6.0"
+        "symfony/framework-bundle": " ^3.4 || ^4.2 || ^5.0 || ^6.0 || ^7.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/Unit/FileStorageTest.php b/tests/Unit/FileStorageTest.php
@@ -41,7 +41,7 @@ public function testConstructorEmptyArray()
     public function testCreateNewCatalogue()
     {
         $writer = $this->getMockBuilder(TranslationWriter::class)
-            ->setMethods([$this->getMethodNameToWriteTranslations()])
+            ->onlyMethods([$this->getMethodNameToWriteTranslations()])
             ->disableOriginalConstructor()
             ->getMock();
         $writer->expects($this->once())
@@ -56,7 +56,7 @@ public function testCreateNewCatalogue()
         $storage->create(new Message('key', 'domain', 'en', 'Message'));
 
         $writer = $this->getMockBuilder(TranslationWriter::class)
-            ->setMethods([$this->getMethodNameToWriteTranslations()])
+            ->onlyMethods([$this->getMethodNameToWriteTranslations()])
             ->disableOriginalConstructor()
             ->getMock();
         $writer->expects($this->once())
@@ -74,7 +74,7 @@ public function testCreateNewCatalogue()
     public function testCreateExistingCatalogue()
     {
         $writer = $this->getMockBuilder(TranslationWriter::class)
-            ->setMethods([$this->getMethodNameToWriteTranslations()])
+            ->onlyMethods([$this->getMethodNameToWriteTranslations()])
             ->disableOriginalConstructor()
             ->getMock();
         $writer->expects($this->once())
@@ -117,7 +117,7 @@ public function testGet()
     public function testUpdate()
     {
         $writer = $this->getMockBuilder(TranslationWriter::class)
-            ->setMethods([$this->getMethodNameToWriteTranslations()])
+            ->onlyMethods([$this->getMethodNameToWriteTranslations()])
             ->disableOriginalConstructor()
             ->getMock();
         $writer->expects($this->exactly(2))
@@ -139,7 +139,7 @@ public function testUpdate()
     public function testDelete()
     {
         $writer = $this->getMockBuilder(TranslationWriter::class)
-            ->setMethods([$this->getMethodNameToWriteTranslations()])
+            ->onlyMethods([$this->getMethodNameToWriteTranslations()])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -163,7 +163,7 @@ public function testDelete()
     public function testImport()
     {
         $writer = $this->getMockBuilder(TranslationWriter::class)
-            ->setMethods([$this->getMethodNameToWriteTranslations()])
+            ->onlyMethods([$this->getMethodNameToWriteTranslations()])
             ->disableOriginalConstructor()
             ->getMock();
 

diff --git a/tests/Unit/XliffConverterTest.php b/tests/Unit/XliffConverterTest.php
@@ -36,6 +36,11 @@ public function testCatalogueToContent()
         $catalogue->add(['foobar' => 'bar']);
         $content = XliffConverter::catalogueToContent($catalogue, 'messages');
 
-        $this->assertRegExp('|foobar|', $content);
+        // If PHPUnit 9.0 or higher is used, use assertMatchesRegularExpression() instead
+        if (method_exists($this, 'assertMatchesRegularExpression')) {
+            $this->assertMatchesRegularExpression('/foobar/', $content);
+        } else {
+            $this->assertRegExp('|foobar|', $content);
+        }
     }
 }