From 996082f5a8819dd02b4fd8f1407a9db1b2465c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Kr=C3=A4mer?= Date: Fri, 29 Apr 2016 22:22:30 +0200 Subject: [PATCH] Removing the check for _ids from the ValidCount rule. --- src/ORM/Rule/ValidCount.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/ORM/Rule/ValidCount.php b/src/ORM/Rule/ValidCount.php index d5ce124fb43..b7af246c1e8 100644 --- a/src/ORM/Rule/ValidCount.php +++ b/src/ORM/Rule/ValidCount.php @@ -9,7 +9,7 @@ * * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) * @link http://cakephp.org CakePHP(tm) Project - * @since 3.0.0 + * @since 3.2.9 * @license http://www.opensource.org/licenses/mit-license.php MIT License */ namespace Cake\ORM\Rule; @@ -17,7 +17,6 @@ use Cake\Datasource\EntityInterface; use Cake\ORM\Association; use Cake\Validation\Validation; -use RuntimeException; /** * Validates the count of associated records. @@ -56,15 +55,6 @@ public function __invoke(EntityInterface $entity, array $options) return false; } - if (isset($value['_ids'])) { - if (!is_array($value['_ids'])) { - return false; - } - $count = count($value['_ids']); - } else { - $count = count($value); - } - - return Validation::comparison($count, $options['operator'], $options['count']); + return Validation::comparison(count($value), $options['operator'], $options['count']); } }