dereuromark 8 years ago
parent
commit
eec5e29be2

+ 3 - 0
composer.json

@@ -47,5 +47,8 @@
 		"test-coverage": "php phpunit.phar --log-junit webroot/coverage/unitreport.xml --coverage-html webroot/coverage --coverage-clover webroot/coverage/coverage.xml",
 		"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 ./"
+	},
+	"config": {
+		"process-timeout": 600
 	}
 }

+ 4 - 4
config/app.default.php

@@ -6,7 +6,7 @@ $config = [
 
 	// Controller pagination
 	'DataPreparation' => [
-		'noTrim' => false
+		'noTrim' => false,
 	],
 
 	// Behaviors
@@ -30,13 +30,13 @@ $config = [
 	// Helpers
 	'Format' => [
 		'fontIcons' => [],
-		'templates' => []
+		'templates' => [],
 	],
 	'Google' => [
 	],
 
 	// Experimental - careful
 	'Entity' => [
-		'autoMarkNew' => false
-	]
+		'autoMarkNew' => false,
+	],
 ];

+ 1 - 1
config/bootstrap.php

@@ -242,7 +242,7 @@ function pre($var, $collapsedAndExpandable = false, $options = []) {
 		'showHtml' => false, // Escape < and > (or manually escape with h() prior to calling this function)
 		'showFrom' => false, // Display file + line
 		'jquery' => null, // null => Auto - use jQuery (true/false to manually decide),
-		'debug' => false // Show only with debug > 0
+		'debug' => false, // Show only with debug > 0
 	];
 	$options += $defaults;
 	if ($options['debug'] && !Configure::read('debug')) {

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

@@ -325,7 +325,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)));
 

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

@@ -368,7 +368,7 @@ class SluggedBehavior extends Behavior {
 
 		$this->config($params, null, false);
 		while (($records = $this->_table->find('all', $params)->toArray())) {
-			/* @var \Cake\ORM\Entity $record */
+			/** @var \Cake\ORM\Entity $record */
 			foreach ($records as $record) {
 				$record->isNew(true);
 				$options = [

+ 0 - 3
tests/TestCase/View/Helper/GravatarHelperTest.php

@@ -90,9 +90,6 @@ class GravatarHelperTest extends TestCase {
 		$this->assertTrue(!empty($is));
 	}
 
-	/**
-	 * BASE TEST CASES
-**/
 
 	/**
 	 * TestBaseUrlGeneration