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
Mark Story
35e0dc2bbd
Merge pull request #5760 from cakephp/master
...
Merge master into 2.7
2015-01-27 20:48:15 -05:00
mark_story
a8ae12a700
Fix warnings when php://output is used with ConsoleOutput.
...
The php://output stream is not compatible with posix functions.
Refs #4901
2015-01-25 22:24:24 -05:00
Robert
db1442573d
Fix failing tests
2015-01-19 08:51:57 +01:00
Robert
dedb2e4191
Added short plugin alias in shells
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
ADmad
4e52941f59
Fix CS errors.
2014-07-27 12:54:15 +05:30
Denys Kyselov
79dc624062
Add removeSubcommand in ConsoleOptionParser
2014-07-21 23:55:42 -04: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
b1610c145e
Merge branch 'master' into 2.6
2014-07-02 23:39:16 -04:00
Renan Gonçalves
1a89a3cb9d
Exiting with 1 when Exception::getCode() returns non-integer values.
...
From php.net/exception.getcode
> Returns the exception code as integer in Exception but possibly as other type in Exception descendants (for example as string in PDOException).
2014-06-26 13:26:20 +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
mark_story
2e4d6eb009
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-05-16 21:26:30 -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
euromark
5e5a776de8
Backporting overwrite() from 3.0 to 2.6.
2014-04-29 02:18:27 +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
mark_story
6c3bc48ce0
Merge branch 'master' into 2.5
2014-03-06 17:45:00 -05:00
ndm2
01e1b5ca61
Fix failing tests caused by already existing classes
2014-03-01 20:24:32 +01:00
ndm2
008ad3237c
Fix verification of expected invocations #2919
2014-03-01 19:06:17 +01:00
mark_story
2c5d96e916
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Datasource/DboSource.php
2014-02-16 14:24:19 -05:00
mark_story
a5d50da040
Remove dead and unused code.
2014-02-11 16:38:24 -05:00
mark_story
be8ebfc005
Merge branch 'master' into 2.5
2014-02-05 09:22:46 -05:00
mark_story
4d57d3ce5b
Fix plugin path filtering when directories do not exist.
...
When paths do not exist we should correctly remove them from the output
paths.
Fixes #2748
2014-01-30 21:40:08 -05:00
mark_story
c1ab6fa9d1
Merge branch 'master' into 2.5
2014-01-30 10:13:37 -05:00
joostdekeijzer
42daa25340
Fix Console "extract i18n from sources" to handle quotes in Model::validate parameters correctly
2014-01-29 14:53:52 +01:00
mark_story
c2b8778ce8
Merge branch 'master' into 2.5
2013-12-14 17:45:49 -05:00
Mark Story
384c3a815d
Merge pull request #2350 from tuffz/formatting_app_uses_blocks
...
formatting app::uses blocks
2013-12-14 12:37:02 -08:00
Brian Porter
bfdc41e8bb
Baked test methods are marked incomplete.
...
Previously empty (and "passing") test methods now include PHPunit's `markTestIncomplete()` to better reflect the truth of the resulting file: The test methods are stubbed out, but are not yet complete and passing.
It is much easier when _running_ tests to locate incomplete test methods.
Fixes 2437.
2013-12-05 22:54:26 -06:00
mark_story
430ef88118
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-11-25 23:15:15 -05:00
mark_story
5e77183afe
Fix failing tests when Console group was run in isolation.
2013-11-23 12:36:02 -05:00
ADmad
dda6080579
Merge branch 'master' into 2.5
2013-11-19 00:27:12 +05:30
Eric Büttner
1e3865acc7
formatting app::uses blocks (refs #2265 )
2013-11-18 11:56:00 +01:00
Marc Würth
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
...
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
Marc Würth
19b972cfeb
Implemented skipping of fields for the data validation rules when baking a model
2013-11-13 13:36:19 +01:00
ADmad
d9ca148499
Merge branch 'master' into 2.5
...
Conflicts:
CONTRIBUTING.md
lib/Cake/Model/Model.php
lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
Marc Würth
86bc9d73cf
Emptied home.ctp in test_app as much as possible
...
This file is never seen by anyone but gets analyzed by
``ExtractTaskTest::testExecute()``
2013-10-24 16:57:58 +02:00
Bryan Crowe
a943ea5c34
Add space between classname(s)
2013-10-22 22:59:50 -04:00
Jose Lorenzo Rodriguez
df549898ad
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
2013-10-12 01:05:02 +02:00
Rick Guyer
a091c630d7
Prevent name param from overwriting file if both are passed
2013-10-09 23:20:25 -05:00
wyrihaximus
ac9b7f3882
Refactored the shell reflection portion into a seperate task.
2013-10-02 22:30:12 +02:00
Cees-Jan
79202ad8a0
Updated doc blocks
2013-10-02 22:02:40 +02:00
mark_story
5e9b22271a
Merge branch 'master' into 2.5
2013-09-27 22:26:33 -04:00
euromark
c23531e806
Assert own tasks are loaded before trying to access taskNames.
2013-09-27 12:53:18 +02:00
mark_story
cc5795c67d
Merge branch 'master' into 2.5
2013-09-26 10:07:10 -04:00
Bryan Crowe
9a1170cd2b
Replaced true asserations with instanceOf asserations in test cases
2013-09-24 22:10:36 -04:00
Bryan Crowe
7d7954ce18
Replaced all is_a() calls with instanceof operator
2013-09-24 21:08:06 -04:00
mark_story
d2577fac60
Merge branch 'master' into 2.5
2013-09-21 20:01:50 -04:00
euromark
58f38f1667
Fix casing of validation rules in bake
2013-09-18 18:31:55 +02:00
mark_story
a7a6fcae8a
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-17 10:11:24 -04:00
euromark
382f75dbfc
cs corrections, bool to boolean and int to integer.
2013-09-17 14:44:34 +02:00
mark_story
59bb05b433
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-02 11:35:09 -04:00
mark_story
4f237e6a93
Merge branch '2.4' making 2.4 into the master branch.
...
Conflicts:
lib/Cake/VERSION.txt
2013-08-30 16:02:42 -04:00
Gilles Wittenberg
a54e8f238e
Add y/yes option to schema create and update subcommands
2013-08-29 09:13:54 +02:00
Mark van Driel
88d7fbeb53
Extract category strings to separate .po files
2013-08-25 23:04:05 +02:00
mark_story
53d265cfba
Merge branch 'master' into 2.4
2013-08-23 12:56:43 -04:00
Renan Gonçalves
703d9881e9
Adding files to be compared against bake generated files, fixing bake templates in the meantime.
...
Writing assertContains() or assertRegExp for generated code is a pain and making the test cover most part of it is very difficult.
Things like:
```
} else {
}
```
Are very easy to happen (which was the case) and was not being covered by the test.
2013-08-21 23:44:07 +02:00
Jose Lorenzo Rodriguez
9d07fc4330
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/ShellDispatcher.php
lib/Cake/Utility/CakeNumber.php
lib/Cake/View/Elements/sql_dump.ctp
2013-08-11 23:31:10 +02:00
U-Zyn Chua
3559aa35af
Removed a stray tab.
2013-08-06 17:13:53 +08:00
Phally
6b41eaa950
Merge branch 'master' into 2.4
2013-07-26 19:44:11 +02:00
Phally
5953171c7b
Fixes cake bake all. Refs #1443 .
2013-07-20 20:21:35 +02:00
Phally
6d6be87f8f
Replaces deprecated paginate() calls in controller bake templates.
...
Fixes #3895 .
2013-07-20 16:59:39 +02:00
ADmad
4ded269549
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
lib/Cake/VERSION.txt
2013-07-07 12:22:12 +05:30
Rachman Chavik
4bb0a1228a
Fix I18n to extract plugin model validation messages
2013-07-07 11:20:14 +07:00
euromark
8141dd2d5d
unify other log types as well
2013-06-21 16:43:01 +02:00
mark_story
cd3c54bb9d
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-06-10 22:12:10 -04:00
euromark
4518624187
more whitespace coding standard corrections
2013-06-09 17:39:48 +02:00
ADmad
636cc8c103
Merge branch 'master' into 2.4
2013-06-09 18:08:32 +05:30
euromark
394bf1054d
remove name attribute where not necessary, clean up doc blocks
2013-06-08 04:29:08 +02:00
ADmad
3303a2cda1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
mark_story
be2a252345
Fix coding standards.
2013-05-31 10:37:20 -04:00
Marc Würth
4c9f0414cb
Improved the DocBlocks and other code cleanup
...
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Marc Würth
2bbd391972
Synced PHP version annotations
...
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
2013-05-29 20:19:14 +02:00
Mark Story
293ba4cdb9
Merge pull request #1261 from dereuromark/2.4-bake-fixtures
...
add schema param and skip interactive prompts if unnecessary
2013-05-07 18:59:42 -07:00
ADmad
a10275fb8b
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
Angel S. Moreno
2c4e9dc8f6
Added Aliasing of Tasks in the TaskCollection() class and added tests
2013-05-03 01:53:37 -04:00
euromark
0959c7008f
add schema param and skip interactive prompts if unnecessary
2013-05-02 00:19:46 +02:00
euromark
5b298c1306
remove copyright noise from test files to unify with new newer files which don't contain it anymore anyway
2013-04-29 17:16:53 +02:00
ADmad
431ab2aebd
Fix CS errors
2013-04-04 17:37:51 +05:30
Rémi Dewitte
c70a3868a9
schema update CREATEs non-existing tables instead of ALTER
2013-04-03 17:37:09 +02:00
euromark
dab0c5e753
Allow behaviors to be added to bake templates and improve doc blocks
2013-03-15 12:14:06 +01:00
mark_story
8209097bc3
Merge branch 'master' into 2.4
2013-03-09 12:40:59 -05:00
Adam Taylor
433dd09ec4
Fix typos
2013-03-05 00:05:14 -07:00
mark_story
cfc10a7c68
Fix failing test and unskip tests in SchemaShell::create()
...
The tests were accidentally skipped when tests for --exclude were added
& fixed. Restore the gist of the previous tests.
2013-03-04 22:37:48 -05:00
mark_story
4a0df83783
Fix failing tests.
...
When the app did not have the correct models, tests would fail.
2013-03-04 22:13:45 -05:00
mark_story
4b13e0a5f2
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-03-04 21:55:29 -05:00
Alexander Hofbauer
c920209f58
SchemaShell: Implement "exclude" parameter
...
Allows for passing a list of tables to ignore when generating schemas.
Closes #3652 .
2013-03-04 22:37:44 +01:00
Kyle Robinson Young
85862bbb9f
Lazy load models in shells.
2013-02-28 20:30:06 -08:00