Merge pull request #466 from bluzphp/develop

Anton · web-flow · commit 78beeae4ff67 · 2019-02-08T12:41:06.000+01:00
Updated version of codeception
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,3 +1,9 @@
+build:
+  nodes:
+    analysis:
+      tests:
+        override:
+          - php-scrutinizer-run
 checks:
   php:
     psr2_switch_declaration: true
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2012-2017 by Bluz PHP Team
+Copyright (c) 2012-2019 by Bluz PHP Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "zendframework/zend-httphandlerrunner": "~1.0"
     },
     "require-dev": {
-        "codeception/codeception": "~2.5",
+        "codeception/codeception": "2.5.3",
         "php-coveralls/php-coveralls": "~2.1",
         "squizlabs/php_codesniffer": "~3.3",
         "phploc/phploc": "~4.0",
diff --git a/src/Crud/CrudInterface.php b/src/Crud/CrudInterface.php
@@ -24,7 +24,7 @@ interface CrudInterface
     /**
      * Default limit for READ SET of elements
      */
-    const DEFAULT_LIMIT = 10;
+    public const DEFAULT_LIMIT = 10;
 
     /**
      * Get item by primary key(s)
diff --git a/src/Db/Db.php b/src/Db/Db.php
@@ -75,7 +75,6 @@ class Db
      *
      * @throws ConfigurationException
      * @return void
-     * @throws DbException
      */
     public function setConnect(array $connect): void
     {
@@ -268,7 +267,7 @@ public function query($sql, array $params = [], array $types = []): int
     /**
      * Create new query select builder
      *
-     * @param array|string ...$select The selection expressions
+     * @param string[] $select The selection expressions
      *
      * @return Query\Select
      */
@@ -567,7 +566,7 @@ public function fetchObjects(string $sql, array $params = [], $object = null)
     {
         $stmt = $this->prepare($sql, $params);
 
-        if (is_string($object)) {
+        if (\is_string($object)) {
             // fetch to some class by name
             $result = $stmt->fetchAll(\PDO::FETCH_CLASS, $object);
         } else {
@@ -660,7 +659,7 @@ protected function ok(): void
     protected function log(string $sql, array $context = []): void
     {
         $sql = str_replace('%', '%%', $sql);
-        $sql = preg_replace('/\?/', '"%s"', $sql, count($context));
+        $sql = preg_replace('/\?/', '"%s"', $sql, \count($context));
 
         // replace mask by data
         $log = vsprintf($sql, $context);
diff --git a/src/Db/Relations.php b/src/Db/Relations.php
@@ -125,8 +125,8 @@ public static function findRelation($row, $relation): array
         }
 
         // check many-to-many relations
-        if (count($relations) === 1) {
-            $relations = Relations::getRelations($model, current($relations));
+        if (\count($relations) === 1) {
+            $relations = self::getRelations($model, current($relations));
         }
 
         $field = $relations[$model];
diff --git a/src/Db/Row.php b/src/Db/Row.php
@@ -153,7 +153,6 @@ public function assert($data): void
      * @throws DbException
      * @throws InvalidPrimaryKeyException
      * @throws TableNotFoundException
-     * @throws \Bluz\Common\Exception\ConfigurationException
      */
     public function save()
     {
diff --git a/src/Grid/Helper/Filter.php b/src/Grid/Helper/Filter.php
@@ -14,6 +14,11 @@
 
 return
     /**
+     * @param string $column
+     * @param string $filter
+     * @param string $value
+     * @param bool   $reset
+     *
      * @return string|null $url
      */
     function ($column, $filter, $value, $reset = true) {
diff --git a/src/Grid/Helper/Limit.php b/src/Grid/Helper/Limit.php
@@ -14,6 +14,8 @@
 
 return
     /**
+     * @param int $limit
+     *
      * @return string
      */
     function ($limit = 25) {
@@ -23,7 +25,7 @@ function ($limit = 25) {
         $rewrite = [];
         $rewrite['limit'] = (int)$limit;
 
-        if ($limit != $this->getLimit()) {
+        if ($limit !== $this->getLimit()) {
             $rewrite['page'] = 1;
         }
 
diff --git a/src/Grid/Helper/Order.php b/src/Grid/Helper/Order.php
@@ -14,6 +14,11 @@
 
 return
     /**
+     * @param string $column
+     * @param null   $order
+     * @param string $defaultOrder
+     * @param bool   $reset
+     *
      * @return string|null $url
      */
     function ($column, $order = null, $defaultOrder = Grid\Grid::ORDER_ASC, $reset = true) {
@@ -29,7 +34,7 @@ function ($column, $order = null, $defaultOrder = Grid\Grid::ORDER_ASC, $reset =
         // change order
         if (null === $order) {
             if (isset($orders[$column])) {
-                $order = ($orders[$column] == Grid\Grid::ORDER_ASC) ?
+                $order = ($orders[$column] === Grid\Grid::ORDER_ASC) ?
                     Grid\Grid::ORDER_DESC : Grid\Grid::ORDER_ASC;
             } else {
                 $order = $defaultOrder;
diff --git a/src/Grid/Helper/Page.php b/src/Grid/Helper/Page.php
@@ -14,6 +14,8 @@
 
 return
     /**
+     * @param int $page
+     *
      * @return string|null
      */
     function ($page = 1) {
diff --git a/src/Grid/Source/ArraySource.php b/src/Grid/Source/ArraySource.php
@@ -41,6 +41,7 @@ public function setSource($source): void
 
     /**
      * {@inheritdoc}
+     * @throws Grid\GridException
      */
     public function process(int $page, int $limit, array $filters = [], array $orders = []): Data
     {
diff --git a/src/Http/CacheControl.php b/src/Http/CacheControl.php
@@ -296,6 +296,7 @@ public function getLastModified(): string
      * @param  \DateTime|string $date A \DateTime instance or date as string
      *
      * @return void
+     * @throws \Exception
      */
     public function setLastModified($date): void
     {
diff --git a/src/Proxy/Cache.php b/src/Proxy/Cache.php
@@ -162,7 +162,7 @@ public static function set($key, $data, $ttl = self::TTL_NO_EXPIRY, $tags = [])
      *
      * @return string
      */
-    public static function prepare($key)
+    public static function prepare($key): string
     {
         return str_replace(['-', '/', '\\', '@', ':'], '_', $key);
     }
@@ -176,7 +176,7 @@ public static function prepare($key)
      *
      * @return bool
      */
-    public static function clearTag($tag)
+    public static function clearTag($tag): bool
     {
         if (self::getInstance() instanceof HierarchicalPoolInterface) {
             return self::getInstance()->invalidateTag($tag);
@@ -193,7 +193,7 @@ public static function clearTag($tag)
      *
      * @return bool
      */
-    public static function clearTags(array $tags)
+    public static function clearTags(array $tags): bool
     {
         if (self::getInstance() instanceof HierarchicalPoolInterface) {
             return self::getInstance()->invalidateTags($tags);
diff --git a/src/Proxy/Layout.php b/src/Proxy/Layout.php
@@ -71,6 +71,7 @@ final class Layout
      * Init instance
      *
      * @return Instance
+     * @throws \Bluz\Common\Exception\CommonException
      */
     private static function initInstance(): Instance
     {
diff --git a/src/Proxy/Logger.php b/src/Proxy/Logger.php
@@ -82,7 +82,7 @@ private static function initInstance()
      *
      * @return void
      */
-    public static function exception($exception)
+    public static function exception($exception): void
     {
         self::getInstance()->error(
             $exception->getMessage() . ' [' .
diff --git a/src/Proxy/Mailer.php b/src/Proxy/Mailer.php
@@ -46,7 +46,6 @@ final class Mailer
      *
      * @return Instance
      * @throws \Bluz\Common\Exception\ConfigurationException
-     * @throws \Bluz\Config\ConfigException
      */
     private static function initInstance(): Instance
     {
diff --git a/src/Proxy/ProxyTrait.php b/src/Proxy/ProxyTrait.php
@@ -29,7 +29,7 @@ trait ProxyTrait
      *
      * @return void
      */
-    public static function setInstance($instance)
+    public static function setInstance($instance): void
     {
         static::$instance = $instance;
     }
diff --git a/src/Validator/Rule/AlphaNumericRule.php b/src/Validator/Rule/AlphaNumericRule.php
@@ -37,8 +37,8 @@ protected function validateClean($input): bool
     public function getDescription(): string
     {
         if (empty($this->additionalChars)) {
-            return __('must contain only letters and digits');
+            return __('must contain only Latin letters and digits');
         }
-        return __('must contain only letters, digits and "%s"', $this->additionalChars);
+        return __('must contain only Latin letters, digits and "%s"', $this->additionalChars);
     }
 }
diff --git a/src/Validator/Rule/AlphaRule.php b/src/Validator/Rule/AlphaRule.php
@@ -37,8 +37,8 @@ protected function validateClean($input): bool
     public function getDescription(): string
     {
         if (empty($this->additionalChars)) {
-            return __('must contain only letters');
+            return __('must contain only Latin letters');
         }
-        return __('must contain only letters and "%s"', $this->additionalChars);
+        return __('must contain only Latin letters and "%s"', $this->additionalChars);
     }
 }
diff --git a/src/Validator/Rule/ArrayRule.php b/src/Validator/Rule/ArrayRule.php
@@ -33,8 +33,6 @@ class ArrayRule extends AbstractRule
      * Setup validation rule
      *
      * @param  callable $callback
-     *
-     * @throws ComponentException
      */
     public function __construct(callable $callback)
     {
@@ -50,10 +48,10 @@ public function __construct(callable $callback)
      */
     public function validate($input): bool
     {
-        if (!is_array($input)) {
+        if (!\is_array($input)) {
             return false;
         }
         $filtered = array_filter($input, $this->callback);
-        return count($input) === count($filtered);
+        return \count($input) === \count($filtered);
     }
 }
diff --git a/src/View/Helper/Partial.php b/src/View/Helper/Partial.php
@@ -41,11 +41,11 @@ function ($__template, $__params = []) {
             }
         }
 
-        if (is_null($__file)) {
+        if ($__file === null) {
             throw new ViewException("Template '{$__template}' not found");
         }
 
-        if (count($__params)) {
+        if (\count($__params)) {
             extract($__params, EXTR_SKIP);
         }
 
diff --git a/src/View/Helper/PartialLoop.php b/src/View/Helper/PartialLoop.php
@@ -35,7 +35,7 @@
  * </code>
  *
  * @param  string $template
- * @param  array  $data
+ * @param  array|object  $data
  * @param  array  $params
  *
  * @return string
diff --git a/src/View/Helper/Select.php b/src/View/Helper/Select.php
@@ -56,15 +56,15 @@ function ($name, array $options = [], $selected = null, array $attributes = [])
          */
         $attributes['name'] = $name;
 
-        if (!is_array($selected)) {
+        if (!\is_array($selected)) {
             if ($selected === null) {
                 // empty array
                 $selected = [];
             } else {
                 // convert one option to an array
                 $selected = [(string)$selected];
             }
-        } elseif (is_array($selected) && count($selected) > 1) {
+        } elseif (\count($selected) > 1) {
             $attributes['multiple'] = 'multiple';
         }
 
@@ -77,7 +77,7 @@ function ($name, array $options = [], $selected = null, array $attributes = [])
         $buildOption = function ($value, $text) use ($selected) {
             $value = (string)$value;
             $option = ['value' => $value];
-            if (in_array($value, $selected)) {
+            if (\in_array($value, $selected, false)) {
                 $option['selected'] = 'selected';
             }
             return '<option ' . $this->attributes($option) . '>' . htmlspecialchars(
@@ -90,7 +90,7 @@ function ($name, array $options = [], $selected = null, array $attributes = [])
 
         $result = [];
     foreach ($options as $value => $text) {
-        if (is_array($text)) {
+        if (\is_array($text)) {
             // optgroup support
             // create a list of sub-options
             $subOptions = [];
diff --git a/src/View/Helper/Url.php b/src/View/Helper/Url.php
@@ -26,7 +26,6 @@
  * @param  bool   $checkAccess
  *
  * @return null|string
- * @throws ViewException
  */
 return
     function ($module, $controller, $params = [], $checkAccess = false) {
diff --git a/src/View/View.php b/src/View/View.php
@@ -116,7 +116,7 @@ public function __toString()
             // clean output
             ob_clean();
         }
-        return ob_get_clean();
+        return (string) ob_get_clean();
     }
 
     /**
diff --git a/src/_translator.php b/src/_translator.php
@@ -22,6 +22,7 @@
 _('is required');
 _('"%s" is not a valid numeric length');
 _('"%s" is not a valid numeric length');
+_('"%s" cannot be less than "%s" for validation');
 _('must be a float number');
 _('must be a string');
 _('must be a valid country code');
@@ -54,6 +55,7 @@
 _('must contain only Latin letters and "%s"');
 _('must contain only Latin letters and digits');
 _('must contain only Latin letters, digits and "%s"');
+_('must have a length "%d"');
 _('must have a length greater than "%d"');
 _('must have a length lower than "%d"');
 _('must have a length between "%d" and "%d"');
diff --git a/tests/unit/Validator/ValidatorChainTest.php b/tests/unit/Validator/ValidatorChainTest.php
@@ -126,7 +126,7 @@ public function testSetCustomDescriptionForValidatorChain()
             ->length(1, 15)
             ->noWhitespace();
 
-        $ruleText = "must contain only letters, digits and \"_\"\n"
+        $ruleText = "must contain only Latin letters, digits and \"_\"\n"
             . "must have a length between \"1\" and \"15\"\n"
             . "must not contain whitespace";
 

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ class Db`
`75`	`75`	`*`
`76`	`76`	`* @throws ConfigurationException`
`77`	`77`	`* @return void`
`78`		`- * @throws DbException`
`79`	`78`	`*/`
`80`	`79`	`public function setConnect(array $connect): void`
`81`	`80`	`{`
`@@ -268,7 +267,7 @@ public function query($sql, array $params = [], array $types = []): int`
`268`	`267`	`/**`
`269`	`268`	`* Create new query select builder`
`270`	`269`	`*`
`271`		`- * @param array\|string ...$select The selection expressions`
	`270`	`+ * @param string[] $select The selection expressions`
`272`	`271`	`*`
`273`	`272`	`* @return Query\Select`
`274`	`273`	`*/`
`@@ -567,7 +566,7 @@ public function fetchObjects(string $sql, array $params = [], $object = null)`
`567`	`566`	`{`
`568`	`567`	`$stmt = $this->prepare($sql, $params);`
`569`	`568`
`570`		`- if (is_string($object)) {`
	`569`	`+ if (\is_string($object)) {`
`571`	`570`	`// fetch to some class by name`
`572`	`571`	`$result = $stmt->fetchAll(\PDO::FETCH_CLASS, $object);`
`573`	`572`	`} else {`
`@@ -660,7 +659,7 @@ protected function ok(): void`
`660`	`659`	`protected function log(string $sql, array $context = []): void`
`661`	`660`	`{`
`662`	`661`	`$sql = str_replace('%', '%%', $sql);`
`663`		`- $sql = preg_replace('/\?/', '"%s"', $sql, count($context));`
	`662`	`+ $sql = preg_replace('/\?/', '"%s"', $sql, \count($context));`
`664`	`663`
`665`	`664`	`// replace mask by data`
`666`	`665`	`$log = vsprintf($sql, $context);`
Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,8 @@ public static function findRelation($row, $relation): array`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`// check many-to-many relations`
`128`		`- if (count($relations) === 1) {`
`129`		`- $relations = Relations::getRelations($model, current($relations));`
	`128`	`+ if (\count($relations) === 1) {`
	`129`	`+ $relations = self::getRelations($model, current($relations));`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`$field = $relations[$model];`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,6 @@ public function assert($data): void`
`153`	`153`	`* @throws DbException`
`154`	`154`	`* @throws InvalidPrimaryKeyException`
`155`	`155`	`* @throws TableNotFoundException`
`156`		`- * @throws \Bluz\Common\Exception\ConfigurationException`
`157`	`156`	`*/`
`158`	`157`	`public function save()`
`159`	`158`	`{`