Merge pull request #391 from bartmcleod/php8-support

Php8 support
lexik · Apr 5, 2021 · 14f7178 · 14f7178
2 parents 1ae3f19 + e38c0f0
commit 14f7178
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ sudo: false
 
 php:
     - 7.4
-#    - 8.0  PHP 7.1 requires a version of PHPUnit (7.5.2) that is too old for 8.0
+    - 8.0
 
 matrix:
     fast_finish: true
@@ -14,7 +14,6 @@ services:
     - mysql
 
 env:
-    - SYMFONY_VERSION=5.0.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha
     - SYMFONY_VERSION=5.2.* DB=pdo_mysql DB_USER=root DB_NAME=lexik_test DEPENDENCIES=alpha
 cache:
     directories:

diff --git a/Tests/Command/ImportTranslationsCommandTest.php b/Tests/Command/ImportTranslationsCommandTest.php
@@ -26,7 +26,7 @@ class ImportTranslationsCommandTest extends WebTestCase
     /**
      *
      */
-    public function setUp()
+    public function setUp(): void
     {
         static::$kernel = static::createKernel();
         static::$kernel->boot();
@@ -102,9 +102,9 @@ public function testExecute()
         $resultLines = explode("\n", $commandTester->getDisplay());
 
         $this->assertEquals('# LexikTranslationBundle:', $resultLines[0]);
-        $this->assertRegExp('/Using dir (.)+\/Resources\/translations to lookup translation files/', $resultLines[1]);
-        $this->assertRegExp('/translations\/LexikTranslationBundle\.((fr)|(en))\.yml" \.\.\. 30 translations/', $resultLines[2]);
-        $this->assertRegExp('/translations\/LexikTranslationBundle\.((fr)|(en))\.yml" \.\.\. 30 translations/', $resultLines[3]);
+        $this->assertMatchesRegularExpression('/Using dir (.)+\/Resources\/translations to lookup translation files/', $resultLines[1]);
+        $this->assertMatchesRegularExpression('/translations\/LexikTranslationBundle\.((fr)|(en))\.yml" \.\.\. 30 translations/', $resultLines[2]);
+        $this->assertMatchesRegularExpression('/translations\/LexikTranslationBundle\.((fr)|(en))\.yml" \.\.\. 30 translations/', $resultLines[3]);
         $this->assertEquals('Removing translations cache files ...', $resultLines[4]);
     }
 }
diff --git a/Tests/Unit/EventDispatcher/CleanTranslationCacheListenerTest.php b/Tests/Unit/EventDispatcher/CleanTranslationCacheListenerTest.php
@@ -20,7 +20,7 @@ class CleanTranslationCacheListenerTest extends TestCase
 
     private $tempDir;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->tempDir = \sys_get_temp_dir() . '/translations';
     }
@@ -81,7 +81,7 @@ private function countFiles($lastUpdateTime)
         return $finder->count();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         \array_map('unlink', \glob($this->tempDir . "/*"));
     }

diff --git a/Tests/Unit/Translation/Exporter/JsonExporterTest.php b/Tests/Unit/Translation/Exporter/JsonExporterTest.php
@@ -14,7 +14,7 @@ class JsonExporterTest extends TestCase
 {
     private $outFileName = '/file.out';
 
-    public function tearDown()
+    public function tearDown(): void
     {
         if (file_exists(__DIR__.$this->outFileName)) {
             unlink(__DIR__.$this->outFileName);

diff --git a/Tests/Unit/Translation/Exporter/PhpExporterTest.php b/Tests/Unit/Translation/Exporter/PhpExporterTest.php
@@ -14,7 +14,7 @@ class PhpExporterTest extends TestCase
 {
     private $outFileName = '/file.out';
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $outFile = __DIR__.$this->outFileName;
 

diff --git a/Tests/Unit/Translation/Exporter/XliffExporterTest.php b/Tests/Unit/Translation/Exporter/XliffExporterTest.php
@@ -14,7 +14,7 @@ class XliffExporterTest extends TestCase
 {
     private $outFileName = '/file.en.out';
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $outFile = __DIR__ . $this->outFileName;
 

diff --git a/Tests/Unit/Translation/Exporter/YamlExporterTest.php b/Tests/Unit/Translation/Exporter/YamlExporterTest.php
@@ -14,7 +14,7 @@ class YamlExporterTest extends TestCase
 {
     private $outFileName = '/file.out';
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $outFile = __DIR__.$this->outFileName;
 

diff --git a/Tests/Unit/Translation/Manager/FileManagerTest.php b/Tests/Unit/Translation/Manager/FileManagerTest.php
@@ -46,7 +46,7 @@ class FileManagerTest extends BaseUnitTestCase
      */
     private $rootDir = '/test/root/dir/app';
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->em = $this->getMockSqliteEntityManager();
         $this->createSchema($this->em);

diff --git a/Tests/Unit/Translation/Manager/TransUnitManagerTest.php b/Tests/Unit/Translation/Manager/TransUnitManagerTest.php
@@ -51,7 +51,7 @@ class TransUnitManagerTest extends BaseUnitTestCase
      */
     private $rootDir = '/test/root/dir/app';
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->em = $this->getMockSqliteEntityManager();
         $this->createSchema($this->em);

diff --git a/composer.json b/composer.json
@@ -17,8 +17,8 @@
         }
     ],
     "require": {
-        "php": "^7.4",
-        "symfony/framework-bundle": "~4.0|~5.0"
+        "php": "^7.4|^8.0",
+        "symfony/framework-bundle": "~5.2"
     },
     "require-dev": {
         "ext-mongodb": "*",
@@ -27,11 +27,12 @@
         "doctrine/doctrine-bundle": "^2.2",
         "doctrine/data-fixtures": "~1.1",
         "doctrine/mongodb-odm-bundle": "~4.2",
-        "propel/propel": "2.0.0-alpha10|dev-master",
-        "phpunit/phpunit": "~7.5.2",
+        "propel/propel": "2.0.0-alpha12|dev-master",
+        "phpunit/phpunit": "^9.5",
         "doctrine/mongodb-odm": "^2.1",
         "mongodb/mongodb": "^1.8",
-        "ext-pdo": "*"
+        "ext-pdo": "*",
+        "mikey179/vfsstream": "^1.6"
     },
     "suggest": {
         "doctrine/orm": ">=2.4"