Merge pull request #10894 from bancer/tests

added composer scripts like in cake 3
This commit is contained in:
Mark Story 2017-07-10 21:00:03 -04:00 committed by GitHub
commit 9a101c2c1c
2 changed files with 18 additions and 3 deletions

View file

@ -26,9 +26,18 @@
"cakephp/cakephp-codesniffer": "^1.0.0"
},
"config": {
"vendor-dir": "vendors/"
"vendor-dir": "vendors/",
"process-timeout": 0
},
"bin": [
"lib/Cake/Console/cake"
]
],
"scripts": {
"check": [
"@cs-check",
"@test"
],
"cs-check": "./vendors/bin/phpcs -p --extensions=php --standard=CakePHP ./lib/Cake",
"test": "./lib/Cake/Console/cake test core AllTests --stderr"
}
}

View file

@ -260,7 +260,13 @@ class Article extends CakeTestModel {
*
* @var array
*/
public $hasAndBelongsToMany = array('Tag');
public $hasAndBelongsToMany = array(
'Tag' => array(
'order' => array(
'Tag.id' => 'ASC',
),
),
);
/**
* validate property