dereuromark 9 years ago
parent
commit
54c4407505

+ 2 - 2
sniff

@@ -11,8 +11,8 @@ fi
 
 if [ "$FIX" = 1 ]; then
 	# Sniff and fix
-	vendor/bin/phpcbf --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=vendor/,tmp/,logs/,tests/test_files/ --extensions=php -v -f ./
+	vendor/bin/phpcbf --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=cakephp-tools/vendor/,tmp/,logs/,tests/test_files/ --extensions=php -v -f ./
 else
 	# Sniff only
-	vendor/bin/phpcs --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=vendor/,tmp/,logs/,tests/test_files/ --extensions=php -v ./
+	vendor/bin/phpcs --standard=vendor/fig-r/psr2r-sniffer/PSR2R/ruleset.xml --ignore=cakephp-tools/vendor/,tmp/,logs/,tests/test_files/ --extensions=php -v ./
 fi

+ 1 - 1
src/Model/Behavior/PasswordableBehavior.php

@@ -297,7 +297,7 @@ class PasswordableBehavior extends Behavior {
 		if ($entity->get($formField) !== null) {
 			$cost = !empty($this->_config['hashCost']) ? $this->_config['hashCost'] : 10;
 			$options = ['cost' => $cost];
-			/** @var \Cake\Auth\AbstractPasswordHasher $PasswordHasher */
+			/* @var \Cake\Auth\AbstractPasswordHasher $PasswordHasher */
 			$PasswordHasher = $this->_getPasswordHasher($this->_config['passwordHasher'], $options);
 			$entity->set($field, $PasswordHasher->hash($entity->get($formField)));
 

+ 2 - 2
src/Model/Table/Table.php

@@ -375,7 +375,7 @@ class Table extends ShimTable {
 			$days = !empty($options['min']) ? $options['min'] : 0;
 			if (!empty($options['after']) && isset($context['data'][$options['after']])) {
 				$compare = $value->subDays($days);
-				/** @var \Cake\I18n\Time $after */
+				/* @var \Cake\I18n\Time $after */
 				$after = $context['data'][$options['after']];
 				if ($after->gt($compare)) {
 					return false;
@@ -383,7 +383,7 @@ class Table extends ShimTable {
 			}
 			if (!empty($options['before']) && isset($context['data'][$options['before']])) {
 				$compare = $value->addDays($days);
-				/** @var \Cake\I18n\Time $before */
+				/* @var \Cake\I18n\Time $before */
 				$before = $context['data'][$options['before']];
 				if ($before->lt($compare)) {
 					return false;

+ 0 - 1
tests/TestCase/Model/Behavior/SluggedBehaviorTest.php

@@ -491,7 +491,6 @@ class SluggedBehaviorTest extends TestCase {
 		$this->assertEquals($expected, $result);
 	}
 
-
 	/**
 	 * Test slug with ascii
 	 *

+ 0 - 1
tests/TestCase/Utility/MimeTest.php

@@ -86,7 +86,6 @@ class MimeTest extends TestCase {
 		//Test failes? finfo_open not availaible??
 	}
 
-
 	/**
 	 * testgetMimeTypeByAlias()
 	 *

+ 0 - 1
tests/TestCase/Utility/TimeTest.php

@@ -163,7 +163,6 @@ class TimeTest extends TestCase {
 		$this->assertEquals('01.12.2009', $ret);
 	}
 
-
 	/**
 	 * TimeTest::testParseLocalizedDate()
 	 *

+ 0 - 1
tests/TestCase/View/Helper/AuthUserHelperTest.php

@@ -82,7 +82,6 @@ class AuthUserHelperTest extends TestCase {
 		$this->assertSame('1', $this->AuthUser->id());
 	}
 
-
 	/**
 	 * AuthUserHelperTest::testId()
 	 *