3.0.0 sql type hints

.gitignore

@@ -1,3 +1,4 @@
+.idea/
 /clover.xml
 /coveralls-upload.json
 /docs/html/

3.0.0.md

@@ -28,3 +28,11 @@ Changed `setDriver(DriverInterface $driver)` for all the following platforms:
     - Zend\Db\Adapter\Platform\Postgresql
     - Zend\Db\Adapter\Platform\Sqlite
     - Zend\Db\Adapter\Platform\SqlServer
+
+- Zend\Db\Sql\Platform\PlatformDecoratorInterface
+
+`setSubject()` cannot be type hinted, since implementations use various types 
+
+- Zend\Db\Sql\AbstractSql
+
+`Zend\Db\Sql\Select::resolveTable()` returns an array where as its parent returns a string

src/Sql/AbstractExpression.php

@@ -1,19 +1,29 @@
 <?php
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframework/zend-db for the canonical source repository
+ * @copyright Copyright (c) 2005-2019 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-db/blob/master/LICENSE.md New BSD License
  */
 
+declare(strict_types=1);
+
 namespace Zend\Db\Sql;
 
+use Zend\Db\Sql\Exception\InvalidArgumentException;
+use function current;
+use function get_class;
+use function gettype;
+use function implode;
+use function in_array;
+use function is_array;
+use function is_int;
+use function is_object;
+use function is_scalar;
+use function key;
+
 abstract class AbstractExpression implements ExpressionInterface
 {
-    /**
-     * @var string[]
-     */
+    /** @var string[] */
     protected $allowedTypes = [
         self::TYPE_IDENTIFIER,
         self::TYPE_LITERAL,
@@ -26,12 +36,11 @@ abstract class AbstractExpression implements ExpressionInterface
      *
      * @param mixed $argument
      * @param string $defaultType
-     *
      * @return array
      *
      * @throws Exception\InvalidArgumentException
      */
-    protected function normalizeArgument($argument, $defaultType = self::TYPE_VALUE)
+    protected function normalizeArgument($argument, string $defaultType = self::TYPE_VALUE) : array
     {
         if ($argument instanceof ExpressionInterface || $argument instanceof SqlInterface) {
             return $this->buildNormalizedArgument($argument, self::TYPE_VALUE);
@@ -50,36 +59,35 @@ protected function normalizeArgument($argument, $defaultType = self::TYPE_VALUE)
 
             $key = key($argument);
 
-            if (is_integer($key) && ! in_array($value, $this->allowedTypes)) {
+            if (is_int($key) && ! in_array($value, $this->allowedTypes)) {
                 return $this->buildNormalizedArgument($value, $defaultType);
             }
 
             return $this->buildNormalizedArgument($key, $value);
         }
 
-        throw new Exception\InvalidArgumentException(sprintf(
+        throw new InvalidArgumentException(sprintf(
             '$argument should be %s or %s or %s or %s or %s, "%s" given',
             'null',
             'scalar',
             'array',
-            'Zend\Db\Sql\ExpressionInterface',
-            'Zend\Db\Sql\SqlInterface',
+            ExpressionInterface::class,
+            SqlInterface::class,
             is_object($argument) ? get_class($argument) : gettype($argument)
         ));
     }
 
     /**
      * @param mixed  $argument
      * @param string $argumentType
-     *
-     * @return array
+     * @return mixed[]
      *
      * @throws Exception\InvalidArgumentException
      */
-    private function buildNormalizedArgument($argument, $argumentType)
+    private function buildNormalizedArgument($argument, string $argumentType) : array
     {
         if (! in_array($argumentType, $this->allowedTypes)) {
-            throw new Exception\InvalidArgumentException(sprintf(
+            throw new InvalidArgumentException(sprintf(
                 'Argument type should be in array(%s)',
                 implode(',', $this->allowedTypes)
             ));

src/Sql/AbstractPreparableSql.php

@@ -1,27 +1,24 @@
 <?php
 /**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframework/zend-db for the canonical source repository
+ * @copyright Copyright (c) 2005-2019 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-db/blob/master/LICENSE.md New BSD License
  */
 
+declare(strict_types=1);
+
 namespace Zend\Db\Sql;
 
-use Zend\Db\Adapter\StatementContainerInterface;
 use Zend\Db\Adapter\AdapterInterface;
 use Zend\Db\Adapter\ParameterContainer;
+use Zend\Db\Adapter\StatementContainerInterface;
 
 abstract class AbstractPreparableSql extends AbstractSql implements PreparableSqlInterface
 {
-    /**
-     * {@inheritDoc}
-     *
-     * @return StatementContainerInterface
-     */
-    public function prepareStatement(AdapterInterface $adapter, StatementContainerInterface $statementContainer)
-    {
+    public function prepareStatement(
+        AdapterInterface            $adapter,
+        StatementContainerInterface $statementContainer
+    ) : StatementContainerInterface {
         $parameterContainer = $statementContainer->getParameterContainer();
 
         if (! $parameterContainer instanceof ParameterContainer) {