Merge branch 'php74' into 'master'

Replace assertFunctionSignature with phpstan's callable types

See merge request !1

.gitlab-ci.yml

@@ -22,3 +22,7 @@ test.verify.php73:
   <<: *test-verify-template
   image: grifart/php7.3-with-gulp-and-all-php-modules
 
+
+test.verify.php74:
+  <<: *test-verify-template
+  image: grifart/php7.4-with-gulp-and-all-php-modules

composer.json

@@ -22,10 +22,9 @@
 
 
     "require": {
-        "php": "~7.2.0 | ~7.3.0",
+        "php": "^7.2",
         "nette/utils": "^3.0.1",
-        "dibi/dibi": "^4.0.2",
-        "grifart/assert-function-signature": "^0.1.0"
+        "dibi/dibi": "^4.0.2"
     },
     "require-dev": {
         "nette/tester": "^2.3",

src/TypeMapper.php

 <?php declare(strict_types=1);
 
-
 namespace Grifart\Tables;
 
-
-use function Grifart\AssertFunction\assertSignature;
-use function Grifart\AssertFunction\nullable;
-
 final class TypeMapper
 {
 
-	private $matchers;
-	private $mappings;
-
-	public function __construct()
-	{
-		$this->mappings = [];
-		$this->matchers = [];
-	}
+	/**
+	 * @var (callable(string $typeName, string $location): ?string)[]
+	 */
+	private $matchers = [];
 
-	// TODO: isn't it too general? Or just map db-type name to php type and back?
-	public function addMapping(callable $typeMatcher, callable $mapper) {
+	/**
+	 * @var (callable(mixed $value, string $typeName): mixed)[]
+	 */
+	private $mappings = [];
 
-		assertSignature($typeMatcher, ['string', 'string'], nullable('string'));
-		assertSignature($mapper, ['any'], 'mixed');
 
+	/**
+	 * @param (callable(string $typeName, string $location): ?string) $typeMatcher
+	 * @param (callable(mixed $value, string $typeName): mixed) $mapper
+	 *
+	 * TODO: isn't it too general? Or just map db-type name to php type and back?
+	 */
+	public function addMapping(callable $typeMatcher, callable $mapper) {
 		$this->matchers[] = $typeMatcher;
 		$this->mappings[] = $mapper;
 	}
@@ -38,12 +36,6 @@ final class TypeMapper
 			$translatingType = $matcher($typeName, $location);
 			if ($translatingType !== NULL) {
 				$mapper = $this->mappings[$idx];
-//				assertSignature(
-//					$mapper, [
-//						$this->getTypeForValue($value)
-//					],
-//					'mixed' // todo: $translatingType does not work for reverse mapping
-//				);
 				return $mapper($value, $typeName);
 			}
 		}