Merge branch 'master' of github.com:php-translation/common into ci-php

php-translation · Jan 29, 2024 · ff157ea · ff157ea
2 parents eb9fa32 + c5874d1
commit ff157ea
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -10,11 +10,12 @@
     ],
     "require": {
         "php": ">=7.2",
-        "symfony/translation": " ^3.4 || ^4.3 || ^5.0 || ^6.0"
+        "symfony/translation": " ^3.4 || ^4.3 || ^5.0 || ^6.0 || ^7.0"
     },
     "require-dev": {
-        "symfony/framework-bundle": " ^3.4 || ^4.3 || ^5.0 || ^6.0",
-        "phpunit/phpunit": ">=8.5.23"
+        "symfony/framework-bundle": " ^3.4 || ^4.3 || ^5.0 || ^6.0 || ^7.0",
+        "phpunit/phpunit": ">=8.5.23",
+        "phpspec/prophecy-phpunit": "^2.1"        
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/Unit/Storage/ChainStorageTest.php b/tests/Unit/Storage/ChainStorageTest.php
@@ -12,13 +12,15 @@
 namespace Translation\common\tests\Unit\Storage;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Translation\MessageCatalogueInterface;
 use Translation\Common\Model\Message;
 use Translation\Common\Storage\ChainStorage;
 use Translation\Common\Storage\StorageInterface;
 
 class ChainStorageTest extends TestCase
 {
+    use ProphecyTrait;
     private $childStorage1;
     private $childStorage2;
     private $storage;

diff --git a/tests/Unit/Storage/FileStorageTest.php b/tests/Unit/Storage/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,6 @@ public function testCatalogueToContent()
         $catalogue->add(['foobar' => 'bar']);
         $content = XliffConverter::catalogueToContent($catalogue, 'messages');
 
-        $this->assertRegExp('|foobar|', $content);
+        $this->assertMatchesRegularExpression('/foobar/', $content);
     }
 }