Mark Scherer 9 years ago
parent
commit
302eca354f

+ 1 - 1
src/Error/ErrorHandler.php

@@ -35,7 +35,7 @@ class ErrorHandler extends CoreErrorHandler {
 	 * @param \Exception $exception Exception instance.
 	 * @return bool
 	 */
-	protected function _logException(\Exception $exception) {
+	protected function _logException(Exception $exception) {
 		$blacklist = [
 			'Cake\Routing\Exception\MissingControllerException',
 			'Cake\Routing\Exception\MissingActionException',

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

@@ -2,6 +2,7 @@
 
 namespace Tools\Model\Behavior;
 
+use ArrayObject;
 use Cake\Event\Event;
 use Cake\ORM\Behavior;
 use Cake\ORM\Entity;
@@ -99,7 +100,7 @@ class BitmaskedBehavior extends Behavior {
 	 * @param \ArrayObject $options
 	 * @return void
 	 */
-	public function beforeRules(Event $event, Entity $entity, \ArrayObject $options) {
+	public function beforeRules(Event $event, Entity $entity, ArrayObject $options) {
 		if ($this->_config['on'] !== 'beforeRules' || !$options['checkRules']) {
 			return;
 		}
@@ -112,7 +113,7 @@ class BitmaskedBehavior extends Behavior {
 	 * @param \ArrayObject $options
 	 * @return void
 	 */
-	public function beforeSave(Event $event, Entity $entity, \ArrayObject $options) {
+	public function beforeSave(Event $event, Entity $entity, ArrayObject $options) {
 		if ($this->_config['on'] !== 'beforeSave') {
 			return;
 		}

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

@@ -2,6 +2,7 @@
 
 namespace Tools\Model\Behavior;
 
+use ArrayObject;
 use Cake\Database\Type;
 use Cake\Datasource\ResultSetInterface;
 use Cake\Event\Event;
@@ -136,7 +137,7 @@ class JsonableBehavior extends Behavior {
 	 * @param \Cake\Event\Event $event
 	 * @return void
 	 */
-	public function beforeSave(Event $event, Entity $entity, \ArrayObject $options) {
+	public function beforeSave(Event $event, Entity $entity, ArrayObject $options) {
 		$fields = $this->_getMappedFields();
 
 		foreach ($fields as $map => $field) {

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

@@ -100,8 +100,6 @@ class PasswordableBehavior extends Behavior {
 	/**
 	 * Adding validation rules
 	 * also adds and merges config settings (direct + configure)
-	 *
-	 * @return void
 	 */
 	public function __construct(Table $table, array $config = []) {
 		$defaults = $this->_defaultConfig;

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

@@ -2,6 +2,7 @@
 
 namespace Tools\Model\Behavior;
 
+use ArrayObject;
 use Cake\Database\Type;
 use Cake\Datasource\ResultSetInterface;
 use Cake\Event\Event;
@@ -103,7 +104,7 @@ class StringBehavior extends Behavior {
 	 * @param \Cake\Event\Event $event
 	 * @return void
 	 */
-	public function beforeSave(Event $event, Entity $entity, \ArrayObject $options) {
+	public function beforeSave(Event $event, Entity $entity, ArrayObject $options) {
 		$this->processItems($entity, 'input');
 	}
 

+ 2 - 2
src/Utility/Text.php

@@ -312,8 +312,8 @@ class Text extends CakeText {
 	 *    echo Str::words('This is a sentence.', 3, '---');
 	 * </code>
 	 *
-	 * @param string  $value
-	 * @param int     $words
+	 * @param string $value
+	 * @param int $words
 	 * @param array $options
 	 * - ellipsis
 	 * - html

+ 2 - 1
src/View/Helper/TimeHelper.php

@@ -5,6 +5,7 @@ namespace Tools\View\Helper;
 use Cake\Core\App;
 use Cake\View\Helper\TimeHelper as CakeTimeHelper;
 use Cake\View\View;
+use DateTime;
 
 /**
  * Wrapper for TimeHelper and TimeLib
@@ -141,7 +142,7 @@ class TimeHelper extends CakeTimeHelper {
 	 * @param array $attr: html attributes
 	 * @return string Nicely formatted date
 	 */
-	public function published(\DateTime $date, array $options = [], array $attr = []) {
+	public function published(DateTime $date, array $options = [], array $attr = []) {
 		$niceDate = '';
 		$when = null;
 		$span = '';

+ 1 - 1
src/View/Helper/TreeHelper.php

@@ -85,7 +85,7 @@ class TreeHelper extends Helper {
 	 * Accepts the results of
 	 *     find('all', array('fields' => array('lft', 'rght', 'whatever'), 'order' => 'lft ASC'));
 	 *     children(); // if you have the tree behavior of course!
-	 * or 	find('threaded'); and generates a tree structure of the data.
+	 * or find('threaded'); and generates a tree structure of the data.
 	 *
 	 * Settings (2nd parameter):
 	 *    'model' => name of the model (key) to look for in the data array. defaults to the first model for the current