Merge branch 'master' into mysql8

Author: moufmouf

phpstan.neon

@@ -11,6 +11,9 @@ parameters:
      - "#expects array<string>, array<int, int|string> given.#"
      - "/Parameter #. \\$types of method Doctrine\\\\DBAL\\\\Connection::.*() expects array<int|string>, array<int, Doctrine\\\\DBAL\\\\Types\\\\Type> given./"
      - "#Method TheCodingMachine\\\\TDBM\\\\Schema\\\\ForeignKey::.*() should return .* but returns array<string>|string.#"
+     -
+        message: '#Result of && is always false.#'
+        path: src/Test/Dao/Bean/Generated/ArticleBaseBean.php
     reportUnmatchedIgnoredErrors: false
 includes:
     - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon

src/Utils/ScalarBeanPropertyDescriptor.php

@@ -210,13 +210,16 @@ public function getGetterSetterCode(): array
 
         $resourceTypeCheck = '';
         if ($normalizedType === 'resource') {
+            $checkNullable = '';
+            if ($isNullable) {
+                $checkNullable = sprintf('$%s !== null && ', $this->column->getName());
+            }
             $resourceTypeCheck .= <<<EOF
-
-if (!\is_resource($%s)) {
+if (%s!\is_resource($%s)) {
     throw \TheCodingMachine\TDBM\TDBMInvalidArgumentException::badType('resource', $%s, __METHOD__);
 }
 EOF;
-            $resourceTypeCheck = sprintf($resourceTypeCheck, $this->column->getName(), $this->column->getName());
+            $resourceTypeCheck = sprintf($resourceTypeCheck, $checkNullable, $this->column->getName(), $this->column->getName());
         }
 
 

tests/TDBMAbstractServiceTest.php

@@ -350,7 +350,8 @@ private static function initSchema(Connection $connection): void
         $db->table('article')
             ->column('id')->string(36)->primaryKey()->comment('@UUID')
             ->column('content')->string(255)
-            ->column('author_id')->references('users')->null();
+            ->column('author_id')->references('users')->null()
+            ->column('attachment')->blob()->null();
 
         $db->table('article2')
             ->column('id')->string(36)->primaryKey()->comment('@UUID v4')

tests/TDBMDaoGeneratorTest.php

@@ -2019,4 +2019,17 @@ public function testNonInstantiableAbstractDaosAndBeans()
         $refClass = new ReflectionClass(UserBaseBean::class);
         $this->assertFalse($refClass->isInstantiable());
     }
+
+    /**
+     * @depends testDaoGeneration
+     */
+    public function testCanNullifyBlob()
+    {
+        $article = new ArticleBean('content');
+        $fp = fopen(__FILE__, 'r');
+        $article->setAttachment($fp);
+        $article->setAttachment(null);
+        $this->assertNull($article->getAttachment(null));
+        fclose($fp);
+    }
 }