Upgrade phpstan to v1.0

composer.json

@@ -39,22 +39,22 @@
         "ext-pdo": "*",
         "atk4/core": "dev-develop",
         "doctrine/dbal": "^2.13.3 || ^3.0",
-        "mvorisek/atk4-hintable": "~1.6.0"
+        "mvorisek/atk4-hintable": "~1.7.0"
     },
     "require-release": {
         "php": ">=7.4 <8.2",
         "ext-intl": "*",
         "ext-pdo": "*",
         "atk4/core": "~3.1.0",
         "doctrine/dbal": "^2.13.3 || ^3.0",
-        "mvorisek/atk4-hintable": "~1.6.0"
+        "mvorisek/atk4-hintable": "~1.7.0"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.13",
         "friendsofphp/php-cs-fixer": "^3.0",
         "johnkary/phpunit-speedtrap": "^3.3",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^0.12.82",
+        "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.5.5"
     },
     "suggest": {

phpstan.neon.dist

@@ -2,7 +2,7 @@ parameters:
     level: 6
     paths:
         - ./
-    excludes_analyse:
+    excludePaths:
         - cache/
         - build/
         - vendor/

src/Field.php

@@ -368,7 +368,7 @@ public function getPersistenceName(): string
      */
     public function useAlias(): bool
     {
-        return isset($this->actual);
+        return $this->actual !== null;
     }
 
     // }}}
@@ -475,7 +475,7 @@ public function __debugInfo(): array
         foreach ([
             'type', 'system', 'never_persist', 'never_save', 'read_only', 'ui', 'joinName',
         ] as $key) {
-            if (isset($this->{$key})) {
+            if ($this->{$key} !== null) {
                 $arr[$key] = $this->{$key};
             }
         }

src/Model.php

@@ -131,19 +131,14 @@ class Model implements \IteratorAggregate
      * model normally lives. The interpretation of the table will be decoded
      * by persistence driver.
      *
-     * You can define this field as associative array where "key" is used
-     * as the name of persistence driver. Here is example for mysql and default:
-     *
-     * $table = ['user', 'mysql' => 'tbl_user'];
-     *
-     * @var string|array<0|string, string>|false
+     * @var string|false
      */
     public $table;
 
     /**
      * Use alias for $table.
      *
-     * @var string
+     * @var string|null
      */
     public $table_alias;
 

src/Model/FieldPropertiesTrait.php

@@ -9,7 +9,7 @@ trait FieldPropertiesTrait
     /**
      * Field type. Name of type registered in \Doctrine\DBAL\Types\Type.
      *
-     * @var string
+     * @var string|null
      */
     public $type;
 
@@ -90,7 +90,7 @@ trait FieldPropertiesTrait
      * will always return meaningful label (even if caption is null). Set
      * this property to any string.
      *
-     * @var string
+     * @var string|null
      */
     public $caption;
 

src/Model/Join.php

@@ -180,13 +180,13 @@ protected function init(): void
             // split by LAST dot in foreign_table name
             [$this->foreign_table, $this->foreign_field] = preg_split('~\.+(?=[^.]+$)~', $this->foreign_table);
 
-            if (!isset($this->reverse)) {
+            if ($this->reverse === null) {
                 $this->reverse = true;
             }
         }
 
         if ($this->reverse === true) {
-            if (isset($this->master_field) && $this->master_field !== $id_field) { // TODO not implemented yet, see https://github.com/atk4/data/issues/803
+            if ($this->master_field && $this->master_field !== $id_field) { // TODO not implemented yet, see https://github.com/atk4/data/issues/803
                 throw (new Exception('Joining tables on non-id fields is not implemented yet'))
                     ->addMoreInfo('condition', $this->getOwner()->table . '.' . $this->master_field . ' = ' . $this->foreign_table . '.' . $this->foreign_field);
             }
@@ -211,6 +211,11 @@ protected function init(): void
         }
 
         $this->onHookShortToOwner(Model::HOOK_AFTER_UNLOAD, \Closure::fromCallable([$this, 'afterUnload']));
+
+        // if kind is not specified, figure out join type
+        if (!$this->kind) {
+            $this->kind = $this->weak ? 'left' : 'inner';
+        }
     }
 
     /**

src/Model/UserAction.php

@@ -54,10 +54,10 @@ class UserAction
     /** @var \Closure|string code, identical to callback, but would generate preview of action without permanent effect */
     public $preview;
 
-    /** @var string caption to put on the button */
+    /** @var string|null caption to put on the button */
     public $caption;
 
-    /** @var string|\Closure a longer description of this action. Closure must return string. */
+    /** @var string|\Closure|null a longer description of this action. Closure must return string. */
     public $description;
 
     /** @var bool Specifies that the action is dangerous. Should be displayed in red. */

src/Persistence.php

@@ -290,7 +290,7 @@ protected function _typecastSaveField(Field $field, $value)
                 throw new Exception('Must be instance of DateTimeInterface');
             }
 
-            if ($field->type === 'datetime' && isset($field->persist_timezone)) {
+            if ($field->type === 'datetime') {
                 $value = new \DateTime($value->format('Y-m-d H:i:s.u'), $value->getTimezone());
                 $value->setTimezone(new \DateTimeZone($field->persist_timezone));
             }
@@ -339,7 +339,7 @@ protected function _typecastLoadField(Field $field, $value)
                 }
             }
 
-            if ($field->type === 'datetime' && isset($field->persist_timezone)) {
+            if ($field->type === 'datetime') {
                 $value = \DateTime::createFromFormat($format, $value, new \DateTimeZone($field->persist_timezone));
                 if ($value !== false) {
                     $value->setTimezone(new \DateTimeZone(date_default_timezone_get()));

src/Persistence/Array_/Join.php

@@ -20,12 +20,7 @@ protected function init(): void
     {
         parent::init();
 
-        // If kind is not specified, figure out join type
-        if (!isset($this->kind)) {
-            $this->kind = $this->weak ? 'left' : 'inner';
-        }
-
-        // Add necessary hooks
+        // add necessary hooks
         if ($this->reverse) {
             $this->onHookShortToOwner(Model::HOOK_AFTER_INSERT, \Closure::fromCallable([$this, 'afterInsert']), [], -5);
             $this->onHookShortToOwner(Model::HOOK_BEFORE_UPDATE, \Closure::fromCallable([$this, 'beforeUpdate']), [], -5);

src/Persistence/Sql.php

@@ -157,7 +157,7 @@ public function add(Model $model, array $defaults = []): Model
 
         $model = parent::add($model, $defaults);
 
-        if (!isset($model->table) || (!is_string($model->table) && $model->table !== false)) {
+        if ($model->table === null) {
             throw (new Exception('Property $table must be specified for a model'))
                 ->addMoreInfo('model', $model);
         }

src/Persistence/Sql/Join.php

@@ -53,19 +53,14 @@ protected function init(): void
 
         $this->getOwner()->persistence_data['use_table_prefixes'] = true;
 
-        // If kind is not specified, figure out join type
-        if (!isset($this->kind)) {
-            $this->kind = $this->weak ? 'left' : 'inner';
-        }
-
-        // Our short name will be unique
+        // our short name will be unique
         if (!$this->foreign_alias) {
             $this->foreign_alias = ($this->getOwner()->table_alias ?: '') . $this->short_name;
         }
 
         $this->onHookShortToOwner(Persistence\Sql::HOOK_INIT_SELECT_QUERY, \Closure::fromCallable([$this, 'initSelectQuery']));
 
-        // Add necessary hooks
+        // add necessary hooks
         if ($this->reverse) {
             $this->onHookShortToOwner(Model::HOOK_AFTER_INSERT, \Closure::fromCallable([$this, 'afterInsert']));
             $this->onHookShortToOwner(Model::HOOK_BEFORE_UPDATE, \Closure::fromCallable([$this, 'beforeUpdate']));

src/Reference.php

@@ -66,15 +66,15 @@ class Reference
      * This is an optional property which can be used by your implementation
      * to store field-level relationship based on a common field matching.
      *
-     * @var string
+     * @var string|null
      */
     protected $their_field;
 
     /**
      * Caption of the referenced model. Can be used in UI components, for example.
      * Should be in plain English and ready for proper localization.
      *
-     * @var string
+     * @var string|null
      */
     public $caption;
 
@@ -205,7 +205,7 @@ protected function initTableAlias(): void
             $aliasFull = $this->link;
             $alias = preg_replace('~_(' . preg_quote($ourModel->id_field, '~') . '|id)$~', '', $aliasFull);
             $alias = preg_replace('~([0-9a-z]?)[0-9a-z]*[^0-9a-z]*~i', '$1', $alias);
-            if (isset($ourModel->table_alias)) {
+            if ($ourModel->table_alias !== null) {
                 $aliasFull = $ourModel->table_alias . '_' . $aliasFull;
                 $alias = preg_replace('~^_(.+)_[0-9a-f]{12}$~', '$1', $ourModel->table_alias) . '_' . $alias;
             }
@@ -280,7 +280,7 @@ public function __debugInfo(): array
         $arr = [];
         foreach ($this->__debug_fields as $k => $v) {
             $k = is_int($k) ? $v : $k;
-            if (isset($this->{$v})) {
+            if ($this->{$v} !== null) {
                 $arr[$k] = $this->{$v};
             }
         }

src/Schema/Migration.php

@@ -180,7 +180,7 @@ protected function getReferenceField(Field $field): ?Field
                 return $reference->their_field;
             }, null, \Atk4\Data\Reference::class)();
 
-            $referenceField = $referenceTheirField ?? $reference->getOwner()->id_field;
+            $referenceField = $referenceTheirField ?? $reference->getOwner()->id_field; // TODO migrate to $reference->getTheirFieldName()
 
             $modelSeed = is_array($reference->model)
                 ? $reference->model

tests/Persistence/Sql/WithDb/SelectTest.php

@@ -243,7 +243,7 @@ public function testOtherQueries(): void
         // That's why we add usort here.
         $data = $this->q('employee')->field('id,name')->getRows();
         usort($data, function ($a, $b) {
-            return $a['id'] - $b['id'];
+            return $a['id'] - $b['id']; // @phpstan-ignore-line
         });
         $this->assertSame(
             [['id' => '1', 'name' => 'Peter'], ['id' => '2', 'name' => 'Jane']],

tests/Persistence/Sql/WithDb/TransactionTest.php

@@ -94,15 +94,6 @@ private function q($table = null, string $alias = null): Query
         return $q;
     }
 
-    /**
-     * @param string|array $template
-     * @param array        $args
-     */
-    private function e($template = [], array $args = null): Expression
-    {
-        return $this->c->expr($template, $args);
-    }
-
     public function testCommitException1(): void
     {
         // try to commit when not in transaction