Joe
70ead28a1d
Redo commits on 2.next branch
2017-05-12 02:02:36 -04:00
chinpei215
31a1837c1d
Merge branch '2.x' into 2.next
...
Conflicts:
lib/Cake/Test/Case/View/Helper/FlashHelperTest.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FlashHelper.php
2017-03-25 17:12:28 +09:00
mark_story
c3f88c350e
Add default value generation for all integer types.
...
This resolves the bigint issue raised by @chinpei in 10347 and adds
default values for the new small & tiny integer types.
2017-03-11 21:46:14 -05:00
chinpei215
7944f512ad
Fix ModelTaskTest for tests passing
2017-01-30 03:22:50 +09:00
Marc Würth
f2638b3e38
Remove superfluous "Class" from doc blocks
2016-08-10 12:22:09 +02:00
nojimage
e71d83c612
TestShell passes the 'directive' option to PHPUnit correctly
2016-08-08 20:09:37 +09:00
xhs345
4d65091d0c
Updated tests
2016-05-03 15:39:37 -07:00
mark_story
9536a10d6d
Make schema import plugin friendly.
...
The changes in #8694 pointed out that schema importing doesn't play nice
with plugins. This corrects that.
2016-04-23 16:18:15 -04:00
mark_story
3a75e8aa72
Use import options when going through execute()
...
The `records` and `schema` options should work when using execute().
Previously they were not working. Furthermore, the records option did
a non-sensical thing where it both set import=>records and generated
static records from the live table. The `records` option now enables
the generation of static data from a live table, as I think this is
a more common scenario.
Refs #8693
2016-04-23 16:15:54 -04:00
mark_story
4389c79442
Update tests.
...
The old tests were relying on the fixed inherit bug. Instead check
a specific permission which will result in a deny.
Refs #8114
2016-02-18 21:24:52 -05:00
mark_story
c0d897b45c
Merge branch '2.x' into 2.8
2016-02-06 20:55:08 -05:00
Edgaras Janušauskas
f389231058
Improve ExtractTask when CakePHP installed via Composer
2016-02-03 14:52:15 +02:00
mark_story
c26b7bbffe
Fix PHPCS errors and failing test.
...
Refs #7577
2015-10-20 21:08:57 -04:00
Marc Würth
5b41a9b52d
Swallow the "--quiet" shell parameter before calling PHPUnit.
...
PHPUnit does not provide a silent or quiet mode, so we cannot pass it along:
https://phpunit.de/manual/3.7/en/phpunit-book.html#textui.clioptions
Resolves #7432
2015-09-22 14:25:53 +02:00
Jose Lorenzo Rodriguez
40d628530a
Merge branch '2.7' into 2.8
2015-08-21 10:54:30 +02:00
mattmemmesheimer
d4467f9acf
Fixing unit tests.
2015-08-18 22:14:10 -05:00
mark_story
ca19b63a32
Merge branch '2.7' into 2.8
2015-08-07 22:04:46 -04:00
Marc Würth
b412b405f9
Make fixture import from table aware of records found
2015-07-23 18:03:42 +02:00
Walter Nasich
9d74bb289c
Fixing a coding standars issue
2015-07-14 00:04:04 -03:00
Walter Nasich
80896cef2a
Replacing param --locations by boolean flag --no-location
2015-07-13 19:47:26 -03:00
Walter Nasich
06b8cb0c30
Renaming option 'headers' to 'locations'
2015-07-13 00:54:11 -03:00
Walter Nasich
67d81e499e
Removing trivial asserts from UT
2015-07-12 23:30:14 -03:00
Walter Nasich
44756eaac5
Adding a new option to i18n shell to generate .pot files without sentence references
2015-07-12 23:08:50 -03:00
Highstrike
a9d77d26f0
fix failing tests
...
fixing...
2015-06-25 13:40:50 +03:00
mark_story
9626f0e726
Exclude deprecated validators from bake.
...
Don't include deprecated validators in bake.
Refs #6581
2015-05-22 22:03:32 -04:00
Mark Scherer
4f3602ad5f
Adjust bake, docblocks and tests for notBlank.
2015-05-17 22:27:16 +02:00
mark_story
3151c53255
Merge branch '2.6' into 2.7
2015-03-23 22:50:09 -04:00
mark_story
5a6a74e2f8
Fix failing tests.
...
The test was taking the wrong index when creating mock path choices.
Refs #6125
2015-03-20 20:35:43 -04:00
mark_story
63769ae4a6
Merge branch 'master' into 2.7
...
Conflicts:
lib/Cake/VERSION.txt
2015-02-26 12:50:35 -05:00
AD7six
d7d2516dc1
Remove unwanted whitespace
2015-02-23 17:22:55 +00:00
AD7six
b151295f1b
Add a better test for the index being correct
2015-02-23 16:46:23 +00:00
mark_story
831fe53f79
Ignore LC_TIME category when extracting messages.
...
Given that we use the specific LC_TIME file format, it doesn't make much
sense to extract translated strings into a PO file that cannot be used
later on.
Refs #5933
2015-02-22 22:39:38 -05:00
mark_story
eb85a875c0
Merge branch 'master' into 2.7
2015-02-10 23:00:43 -05:00
Rachman Chavik
acd32b71fe
Fix: "bake plugin" generates incorrect directory for View/Layouts
2015-02-04 15:47:01 +07:00
Robert
db1442573d
Fix failing tests
2015-01-19 08:51:57 +01:00
Edgaras Janušauskas
3ae61e9e16
Fix Extract task to correctly extract messages with context
2014-12-25 14:28:44 +02:00
mark_story
3095187952
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-11-10 19:38:31 -05:00
mark_story
7718d473c4
Remove singularization on schema class names.
...
Using camelize() does the transformation we want without also
singularizing the name. This makes user input more transparent and fixes
issues around plugin schemas with plural names.
Refs #4993
2014-11-09 21:52:10 -05:00
Marc Würth
edc6490f11
Removed Vendor folder from plugin baking task, updated test
2014-08-18 18:55:17 +02:00
Marc Würth
6e1b8f3ce8
Added missing folders to plugin baking task, updated test
2014-08-18 18:54:48 +02:00
Mark Story
dbe7329e54
Merge pull request #3703 from MMS-Projects/i18n-context-2.6
...
Basic support for I18n contexts as requested by #2063
2014-07-18 21:48:19 -04:00
Marlin Cremers
b47f91c47c
Add context support to the I18n class which resolves cakephp/cakephp#2063
...
This change adds Gettext context support to the I18n class. This
allows custom translations for verbs and nouns and more.
2014-07-17 11:01:11 +02:00
mark_story
2bcd817367
Merge branch 'master' into 2.6
2014-07-03 11:13:06 -04:00
euromark
974ca851c2
Correct doc blocks according to cs guidelines.
...
Remove superfluous empty lines.
2014-07-03 15:36:42 +02:00
Mark Story
9c9d45596f
Merge pull request #3478 from Schlaefer/#3303-lengthBetween
...
closes #3303 RFC: Rename Validator::between() into Validator::length()
2014-05-24 16:48:05 -04:00
Schlaefer
6b80ae35b1
fixes model task test-cases for 'between' validation rule alias
2014-05-14 10:55:24 +02:00
Schlaefer
bf0edd1112
fixes failing test cases in ModelTaskTest if not run in test-suite
...
Tests 'testSkipTablesAndAll' and 'testExecuteIntoAll' didn't took fixture
table 'core.number_tree' into account.
2014-05-14 10:34:09 +02:00
Schlaefer
021d765620
fixes falling test case for 'lengthBetween' validator
2014-05-13 10:46:50 +02:00
Jose Lorenzo Rodriguez
343d3279b9
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2014-04-06 21:50:41 +02:00
euromark
0d09a54033
more missing doc block tags added
2014-04-02 03:02:37 +02:00