dereuromark 8 年之前
父节点
当前提交
363b8bd489

+ 1 - 1
composer.json

@@ -45,7 +45,7 @@
 		"test": "php phpunit.phar",
 		"test-setup": "[ ! -f phpunit.phar ] && wget https://phar.phpunit.de/phpunit.phar",
 		"test-coverage": "php phpunit.phar --log-junit webroot/coverage/unitreport.xml --coverage-html webroot/coverage --coverage-clover webroot/coverage/coverage.xml",
-		"cs-check": "vendor/bin/phpcs -p --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=/cakephp-tools/vendor/,/tmp/,/logs/,/tests/test_files/ --extensions=php ./",
+		"cs-check": "phpcs -p --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=/cakephp-tools/vendor/,/tmp/,/logs/,/tests/test_files/ --extensions=php ./",
 		"cs-fix": "phpcbf -v --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=/cakephp-tools/vendor/,/tmp/,/logs/,/tests/test_files --extensions=php ./"
 	}
 }

+ 0 - 2
src/Model/Behavior/BitmaskedBehavior.php

@@ -6,10 +6,8 @@ use ArrayObject;
 use Cake\Datasource\EntityInterface;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
-use Cake\ORM\Entity;
 use Cake\ORM\Query;
 use Cake\Utility\Inflector;
-use Exception;
 use RuntimeException;
 use Tools\Utility\Text;
 

+ 1 - 2
src/Model/Behavior/JsonableBehavior.php

@@ -9,7 +9,6 @@ use Cake\Event\Event;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;
-use Exception;
 use RuntimeException;
 use Tools\Database\Type\ArrayType;
 use Tools\Utility\Text;
@@ -73,7 +72,7 @@ class JsonableBehavior extends Behavior {
 
 	/**
 	 * @param array $config
-	 * @throws \Exception
+	 * @throws \RuntimeException
 	 * @return void
 	 */
 	public function initialize(array $config = []) {

+ 3 - 4
src/Model/Behavior/PasswordableBehavior.php

@@ -8,9 +8,7 @@ use Cake\Core\Configure;
 use Cake\Datasource\EntityInterface;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
-use Cake\ORM\Entity;
 use Cake\ORM\Table;
-use Exception;
 use RuntimeException;
 
 if (!defined('PWD_MIN_LENGTH')) {
@@ -316,8 +314,9 @@ class PasswordableBehavior extends Behavior {
 	 *
 	 * @param \Cake\Event\Event $event
 	 * @param \Cake\Datasource\EntityInterface $entity
-	 * @param ArrayObject $options
-	 * @throws Exception
+	 * @param \ArrayObject $options
+	 * @throws \RuntimeException
+	 * @return void
 	 */
 	public function beforeSave(Event $event, EntityInterface $entity, ArrayObject $options) {
 		$formField = $this->_config['formField'];

+ 0 - 1
src/Model/Behavior/ResetBehavior.php

@@ -5,7 +5,6 @@ namespace Tools\Model\Behavior;
 use Cake\Core\Configure;
 use Cake\ORM\Behavior;
 use Cake\ORM\Table;
-use Exception;
 use RuntimeException;
 
 /**

+ 2 - 4
src/Model/Behavior/SluggedBehavior.php

@@ -6,11 +6,9 @@ use Cake\Core\Configure;
 use Cake\Datasource\EntityInterface;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
-use Cake\ORM\Entity;
 use Cake\ORM\Query;
 use Cake\ORM\Table;
 use Cake\Utility\Inflector;
-use Exception;
 use InvalidArgumentException;
 use RuntimeException;
 
@@ -249,7 +247,7 @@ class SluggedBehavior extends Behavior {
 	 * @param string $value
 	 * @param \Cake\Datasource\EntityInterface|null $entity
 	 * @return string A slug
-	 * @throws Exception
+	 * @throws \RuntimeException
 	 */
 	public function generateSlug($value, EntityInterface $entity = null) {
 		$separator = $this->_config['separator'];
@@ -342,7 +340,7 @@ class SluggedBehavior extends Behavior {
 	 *
 	 * @param array $params
 	 * @return bool Success
-	 * @throws Exception
+	 * @throws \RuntimeException
 	 */
 	public function resetSlugs($params = []) {
 		if (!$this->_table->hasField($this->_config['field'])) {

+ 0 - 1
src/Model/Behavior/StringBehavior.php

@@ -7,7 +7,6 @@ use Cake\Datasource\EntityInterface;
 use Cake\Datasource\ResultSetInterface;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
-use Cake\ORM\Entity;
 use Cake\ORM\Query;
 
 /**