CI - GH Actions: Increase PHPStan version, fix a load of errors.

rodion-k · Mar 21, 2021 · 3b10344 · 3b10344
1 parent 0c96d3a
commit 3b10344
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 28 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -47,7 +47,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
+          - "7.4"
 
     services:
       mysql:
@@ -90,7 +90,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
+          - "7.4"
 
     services:
       mysql:
@@ -137,8 +137,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.3"
-          - "7.4"
+          - "8.0"
 
     services:
       mysql:

diff --git a/composer.json b/composer.json
@@ -13,18 +13,18 @@
         }
     ],
     "require": {
-    	"php": ">=7.2.0",
+    	"php": ">=7.4.0 || ^8.0",
     	"mouf/utils.common.conditioninterface": "~2.0",
     	"mouf/utils.value.value-interface": "~1.0",
     	"mouf/utils.common.paginable-interface": "~1.0",
     	"mouf/utils.common.sortable-interface": "~1.0",
         "mouf/schema-analyzer": "~1.0",
         "twig/twig": "^2.11 || ^3",
-        "greenlion/php-sql-parser": "^4.1.2",
+        "greenlion/php-sql-parser": "^4.3",
         "doctrine/cache": "^1.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5.10",
+        "phpunit/phpunit": "^9.5",
         "satooshi/php-coveralls": "~1.0",
         "doctrine/dbal": "~2.5",
         "phpstan/phpstan": "^0.12.82"

diff --git a/tests/Mouf/Database/MagicQuery/Twig/SqlTwigEnvironmentFactoryTest.php b/tests/Mouf/Database/MagicQuery/Twig/SqlTwigEnvironmentFactoryTest.php
@@ -4,25 +4,21 @@
 
 use Mouf\Database\MagicQuery\Twig\SqlTwigEnvironmentFactory;
 use PHPUnit\Framework\TestCase;
+use Twig\Error\RuntimeError;
 
 class SqlTwigEnvironmentFactoryTest extends TestCase
 {
-    /**
-     *
-     */
     public function testIf()
     {
         $twig = SqlTwigEnvironmentFactory::getTwigEnvironment();
         $sql = $twig->render('SELECT * FROM toto {% if id %}WHERE id = :id{% endif %}', ['id' => 12]);
         $this->assertEquals('SELECT * FROM toto WHERE id = :id', $sql);
     }
 
-    /**
-     * @expectedException \Twig\Error\RuntimeError
-     */
     public function testException()
     {
         $twig = SqlTwigEnvironmentFactory::getTwigEnvironment();
+        $this->expectException(RuntimeError::class);
         $twig->render('SELECT * FROM toto WHERE id = {{ id }}', ['id' => 'hello']);
     }
 }
diff --git a/tests/Mouf/Database/MagicQueryTest.php b/tests/Mouf/Database/MagicQueryTest.php
@@ -210,23 +210,19 @@ public function testStandardSelect()
         $this->assertEquals($sql, self::simplifySql($magicQuery->build($sql)));
     }
 
-    /**
-     * @expectedException \Mouf\Database\MagicQueryException
-     */
     public function testInNullException() {
         $magicQuery = new MagicQuery();
 
         $sql = 'SELECT * FROM users WHERE status IN :statuses!';
+        $this->expectException(MagicQueryException::class);
         $magicQuery->build($sql, ['statuses' => NULL]);
     }
 
-    /**
-     * @expectedException \Mouf\Database\MagicQueryException
-     */
     public function testInvalidSql() {
         $magicQuery = new MagicQuery();
 
         $sql = 'SELECT * FROM users WHERE date_end => :startDate';
+        $this->expectException(MagicQueryException::class);
         $this->assertEquals('SELECT * FROM users WHERE date_end => \'2014-06-06\'', self::simplifySql($magicQuery->build($sql, ['startDate' => '2014-06-06'])));
     }
 
@@ -252,14 +248,12 @@ public function testWithCache()
         $this->assertEquals($sql, self::simplifySql($magicQuery->build($sql)));
     }
 
-    /**
-     * @expectedException \Mouf\Database\MagicQueryParserException
-     */
     public function testParseError()
     {
         $magicQuery = new MagicQuery();
 
         $sql = '';
+        $this->expectException(MagicQueryParserException::class);
         $magicQuery->build($sql);
     }
 
@@ -392,20 +386,15 @@ public function testMatchAgainst()
         $this->assertEquals($expectedSql, self::simplifySql($magicQuery->build($sql, $params)));
     }
 
-    /**
-     * @expectedException \Mouf\Database\MagicQueryMissingConnectionException
-     */
     public function testMisconfiguration()
     {
         $magicQuery = new MagicQuery();
 
         $sql = "SELECT role.* FROM magicjoin(role) WHERE right.label = 'my_right'";
+        $this->expectException(MagicQueryMissingConnectionException::class);
         $magicQuery->build($sql);
     }
 
-    /**
-     *
-     */
     public function testTwig()
     {
         $magicQuery = new MagicQuery();