Commit graph

385 commits

Author SHA1 Message Date
Christian Winther
ae3d9a7a8e Remove ` from help line 2013-05-29 13:46:13 +00:00
Christian Winther
2fca41c35d Enable the user to provide a CLI theme through the --theme option for all bake tasks 2013-05-29 13:41:57 +00:00
ADmad
36c592e72e Merge branch 'master' into 2.4 2013-05-26 11:23:53 +05:30
Mischa ter Smitten
c0039f642e Output to stderr, not stdout 2013-05-25 23:19:31 +02:00
Mischa ter Smitten
caec0abcfc Fix for ExtractTask does not check output directory (ticket 3852) 2013-05-25 22:32:07 +02:00
euromark
e3e11a48e6 fix some domain translations and remove leftover true param from 1.x 2013-05-22 11:15:01 +02:00
ADmad
fb86859585 Merge branch 'master' into 2.4 2013-05-19 14:37:41 +05:30
euromark
e1d6bb2120 code is not translatable and should not be part of the translation strings 2013-05-17 15:54:55 +02:00
euromark
97c2cb367d CS fixes 2013-05-17 10:36:17 +02:00
euromark
0959c7008f add schema param and skip interactive prompts if unnecessary 2013-05-02 00:19:46 +02:00
mark_story
aee8b50507 Merge branch 'master' into 2.4 2013-04-15 21:48:26 -04:00
mark_story
8eb56960d8 Remove remaining reference operators.
These were left over from the days of 1.x and aren't needed anymore.
2013-04-15 21:23:48 -04:00
euromark
dab0c5e753 Allow behaviors to be added to bake templates and improve doc blocks 2013-03-15 12:14:06 +01:00
Adam Taylor
433dd09ec4 Fix typos 2013-03-05 00:05:14 -07:00
Ceeram
e2ebeefda0 add CAKE to the paths after handling parameters that depend on _isExtractingApp() return value, fixes LH-3442 2013-03-04 14:49:01 +01:00
mark_story
474210d007 Properly initialize variable.
Fixes #3658
2013-03-01 13:42:39 -05:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
Graham Weldon
26a08c6780 Updated copyright 2013-02-08 21:28:17 +09:00
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
mark_story
7d72a6f249 Fix issue where bake was missing habtm associations
If the current model is not the first table, habtm associations would be
missed. This was caused by eff4004261

Refs #3532
Fixes #3605
2013-02-06 20:31:15 -05:00
mark_story
4af6039107 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
Gordon Pettey (petteyg)
ec619eec04 Remove some spacial overkill 2013-01-23 23:20:41 +00:00
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
Rachman Chavik
622d2f04f9 removing extra newline in baked files 2013-01-20 09:07:31 +07:00
jroberts0001
e8647d77eb Added App::uses to the PluginAppController and PluginAppModel bake templates 2013-01-20 08:47:52 +07:00
mark_story
5a6a45d0d1 Add support for --admin to bake controller all.
I missed this when originally implementing bake controller all.

Fixes #3536
2013-01-16 12:57:18 -05:00
mark_story
0ed9e3c120 Only bake HABTM associations for tables that exist.
bake often guesses wrong when it comes to habtm. Only add associations
we're highly confident of. This includes tables where the foreign table
also exists.

Refs #3532
2013-01-15 21:43:30 -05:00
mark_story
eff4004261 Don't treat tables that substring match as associations
The table structure of:

- packages
- userpackages
- georegions
- userpackages_georegions

Should not create a habtm between packages & georegions.

Fixes #3532
2013-01-14 20:39:01 -05:00
Ceeram
3f4d24bfc0 remove unused local variables and a few improvements 2012-12-23 13:53:13 +01:00
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
euromark
41f2d812bb fix ticket 3429 2012-12-03 12:31:56 +01:00
ADmad
72d6ca636f Docblock fixes 2012-11-29 04:36:29 +05:30
Ceeram
eadc3a75e5 fix coding standards 2012-11-21 15:39:03 +01:00
mark_story
27d7e2865e Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
Ceeram
e02eab05d5 Remove all todo from core, create tickets for them 2012-11-14 14:59:51 +01:00
euromark
8f78b1e05b fix coding standards for whitespaces 2012-11-14 12:24:08 +01:00
euromark
f3bbe89ede solves ticket 3306 2012-10-25 17:08:52 +02:00
Adam Taylor
4090c2e932 Remove trailing whitespace from comments
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00
dogmatic69
408e619c9f Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
ADmad
035f727686 Replace Model::read() with Model::find('first') in baked controller
Removed references to Ajax and Javascript helpers
2012-09-30 14:41:37 +05:30
euromark
b7f1740d2b correcting coding-standards 2012-09-28 13:49:51 +02:00
Jose Lorenzo Rodriguez
d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
mark_story
3dd82e6d88 Fix Database/ from always being appended to the driver name.
Fixes #3223
2012-09-19 20:55:39 -04:00
euromark
213d4caa85 coding standards 2012-09-20 01:50:15 +02:00
dogmatic69
cfadc4dbb0 strict type checks and removing some duplicate count() calls by setting a variable 2012-09-14 19:26:00 +01:00
dogmatic69
5cc03ca805 converting if($foo == true) to if($foo) 2012-09-14 18:54:29 +01:00
dogmatic69
22a2e1b51e converting $foo == / $foo == 0 to !$foo (and a few $foo === 0) 2012-09-14 18:42:25 +01:00
dogmatic69
cf8fccae96 converting $foo == null / $foo == false to !$foo 2012-09-14 18:26:30 +01:00
mark_story
571c8bc08c Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/Task/TestTask.php
2012-09-01 13:51:40 +01:00
mark_story
d3105332dc Fix coding standards errors. 2012-09-01 12:14:15 +01:00
mark_story
17ba713651 Simplify code. 2012-08-24 22:52:02 -04:00
Tigran Gabrielyan
8e818c89b6 Added $prefix generation in core.php for cake bake shell 2012-08-24 22:52:02 -04:00
mark_story
62dd39133b Fix lint errors + comment content. 2012-08-20 16:21:59 -04:00
mark_story
c83e941497 Merge branch 'master' into 2.3 2012-08-15 21:00:49 -04:00
mark_story
73f29069de Fix issue where omitting a base class would break test generation.
Fixes #3115
2012-08-15 20:59:56 -04:00
mark_story
4487673060 Merge branch 'master' into 2.3 2012-08-09 20:43:47 -04:00
mark_story
73b1c0ac1c Fix off by one error.
Fixes #3094
2012-08-03 23:34:44 -04:00
mark_story
d94cdc67fe Merge branch 'master' into 2.3 2012-07-27 22:38:24 -04:00
mark_story
35bf3097cd Fixing missing imports in generated tests.
Fixes #3059
2012-07-23 21:25:55 -04:00
mark_story
3c6b50953b Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
euromark
3945c0e6a8 rtim files 2012-07-18 03:55:29 +02:00
mark_story
b7415525c8 Fix missing line breaks.
Fixes #3028
2012-07-11 15:51:07 -04:00
mark_story
3c824b586f Use $this->bootstrap.
$this->boostrap makes the output match the file changed.
2012-06-18 21:38:08 -04:00
AD7six
23c37efc71 Load fixtures from a consistent location
If a test is baked for a plugin - it should by default look for fixtures in the
same plugin, otherwise it creates potentially complex inter-plugin/app
dependencies.
2012-06-14 13:28:35 +02:00
mark_story
5413143178 Don't modify app/Config/bootstrap when running tests. 2012-06-12 22:10:55 -04:00
mark_story
f6b50a948e Small fixes for validation formatting.
* Remove additional out() calls.
* Remove extra punctuation.
* Fix code standards.
* Fix failing test.
2012-06-10 21:57:15 -04:00
Fitorec
1bcb8daf21 Adding case 'datetime' to validation guesses.
In ModelTask->fieldValidation added option "datetime"
2012-06-10 21:56:43 -04:00
Fitorec
c090845117 Fixing coding style. 2012-06-10 21:56:43 -04:00
Fitorec
207b918b59 Removing the case 2012-06-10 21:56:39 -04:00
Fitorec
fa2a75c3f1 Add the numbers format console menus, showing the validation options in 2 columns. 2012-06-10 21:56:30 -04:00
Jelle Henkens
c8e58b50ba Adding cake core message extraction in cake extract 2012-06-07 23:55:36 +01:00
AD7six
33c112b353 doesn'st need to be a verbose level message
other create mesages are output normally
2012-06-07 23:03:53 +02:00
AD7six
488ba9ef85 Make baking a plugin more user friendly.
Changed the text when the plugin already exists to indicate that the task stops
intentionally.

If there are folder errors - report them in the cli.

Choose the last plugin path by default

Modify the app's bootstrap file if it's not being (obviously) loaded already.
This means it is now possible to do:

    Console/cake bake plugin MyPlugin
    Console/cake bake model MyPlugin.MyModel

Previously the above would result in an error (which only if you know), you'd
fix by editing your Config/bootstrap.php file by hand before retrying to bake
your model.
2012-06-07 09:04:02 +02:00
AD7six
d1475b1fd3 initialize $construct variable 2012-06-06 22:24:15 +02:00
AD7six
a5fabcc1dc No startup and teardown for controller tests
and.. no startup/teardown functions unless they are actually going to do more
than just call parent
2012-06-06 21:06:37 +02:00
Jelle Henkens
0e34bd4b1d Suggest current path in bake project if dir is empty 2012-06-03 14:01:03 +01:00
Jelle Henkens
5656461025 Adding overwrite option to the i18n extract task 2012-05-25 17:01:56 +01:00
AD7six
af4a2efc33 allow baking tests for controllers with uses
if a controller has

	public $uses => array('MyPlugin.MyModel')

in their controller - the bake controller task will fail because `$controller->MyPlugin.MyModel`
doesn't exist
2012-05-25 13:09:52 +02:00
Jelle Henkens
f7ce5262b7 Updating mixed @param documentation to seperate list of accepted types 2012-05-21 21:55:10 +01:00
mark_story
9628910c86 Merge branch '2.1' into 2.2 2012-05-12 20:26:36 -04:00
mark_story
8103eae9f1 Make input prompt clearer in extract task.
Make the prompt display the paths that will be scanned.  Hopefully
this makes the shell a bit easier to use and understand. Also
make the shell not accept 0 paths as a correct answer.

Fixes #2877
2012-05-12 20:26:11 -04:00
Washington
c651bf25d3 remove stub class from controller tests template and mock condition to
make it extends ControllerTestCase
2012-05-11 14:51:56 -03:00
AD7six
6933b31be5 include plugin name in model tests 2012-05-11 00:33:10 +02:00
AD7six
08c3008874 load app classes automatically for plugins
Otherwise baking a test for a plugin model (example) fails
2012-05-10 23:51:09 +02:00
AD7six
3a5e00fa53 var_export dumps null as NULL
correct for that so code standards are met with the results
2012-05-09 23:38:30 +02:00
mark_story
b57489f3f1 Remove duplicate template.
Also remove double creating the home.ctp file.

Fixes #2842
2012-05-02 20:54:50 -04:00
Rachman Chavik
e7fa2a526f remove whitespace at eol 2012-05-01 21:35:48 +07:00
AD7six
9444af2f81 classify the first cli argument for this task
the $type is used to lookup in the $classTypes property what kind of
entity is being baked. if it's underscored, getRealClassName will bail
on it's first condition of "is it in the $classTypes property" producing
mostly useless test stubs for everything except models
2012-04-29 17:20:14 +02:00
Mark Story
f150ebb9cc Merge pull request #623 from dereuromark/2.2-bake-theme-order
Correct order of bake themes so app and plugin precede core ones

Fixes #2825
2012-04-26 09:43:53 -07:00
mark_story
b6de177ffa Merge branch '2.1' into 2.2 2012-04-23 21:50:36 -04:00
euromark
6353558622 bame themes now in correct order: app -> plugin -> default 2012-04-24 02:40:42 +02:00
Rachman Chavik
36275129d7 i18n: consider real path of APP to handle symlinks
When extracting model validation messages, Reflection::getFileName is used
to obtain the the model filename. The returned value is actual physical
path and may differ to what APP is. Adding the realpath(APP) to $paths
variable allows str_replace() to correctly generate the correct value for
$occurences.
2012-04-24 07:29:26 +07:00
mark_story
9f9feec222 Merge branch '2.2-hash' into 2.2
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
ee7a224639 Fix a code style warning. 2012-03-31 21:40:20 -04:00
Kyle Robinson Young
e2a46f76c7 substr() optimizations 2012-03-28 13:07:26 -07:00
mark_story
19e0d8d946 Switch usage to Hash where possible. 2012-03-26 22:32:53 -04:00
Juan Basso
c754fb2dcb Updated copyright to 2012. 2012-03-12 22:46:46 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
664b0538b8 Fix more coding standards problems. 2012-03-04 22:49:38 -05:00
mark_story
db8c6b5c78 Fix most of the coding standards issues in Console/ 2012-03-03 18:55:29 -05:00
mark_story
7d51db9e63 Merge branch '2.0' into 2.1 2012-03-03 12:27:22 -05:00
Rob McVey
8e93c4cd34 Fix for Consolce/Task/TestTask::getRealClassName(). Controller names of exactly 10 letters
being returned incorrectly

Signed-off-by: mark_story <mark@mark-story.com>
2012-02-28 15:21:59 -05:00
euromark
22452f61f8 type hinting controllers and views 2012-02-25 19:46:06 -05:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
Kyle Robinson Young
45ec5d73c5 Add missing visibility keywords 2012-02-16 23:13:12 -08:00
Majna
1dbafe1d4f Fix docblocks. 2012-02-17 13:51:20 +01:00
AD7six
369d316835 Restructure internals of Extract task
Use variables which are easily identifiable and an internal storage
structure which prevents duplicates.
2012-02-14 15:30:09 +01:00
mark_story
2afb05b590 Merge branch '2.0' into 2.1
Conflicts:
	app/View/Pages/home.ctp
	lib/Cake/Config/config.php
	lib/Cake/Core/App.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/NumberHelper.php
2012-02-12 10:06:13 -05:00
Majna
454f383951 Fix console option parser for --empty in ProjectTask.
Command 'cake bake project --empty myapp' ignores argument myapp.
2012-02-07 18:35:12 +01:00
mark_story
4949a87b7e Fix issues with duplicate msgid values.
Msgid values could be duplicated if the same string was used
for singular and pluralized translations.  Re-index how the data is
stored so duplicate singular detection per domain is easier.

Fixes #2538
2012-02-06 21:25:11 -05:00
Vinícius Krolow
fa5f175244 Improve the extract to know when there is the same string inside one plural
Fixes #2538
2012-02-06 20:10:33 -05:00
mark_story
f3b990bf0f Correct path display for plugins.
Fixes #2548
2012-02-05 12:00:55 -05:00
mark_story
752711e963 Fix missing behavior constructor. 2012-01-27 21:10:57 -05:00
mark_story
9ff0739504 Improving test generation.
Class construction can be a bit more complicated now.
2012-01-27 20:59:03 -05:00
mark_story
70bb839de9 Add validation guess for not null + text types.
Fixes #2493
2012-01-21 13:10:30 -05:00
mark_story
df5d9ac3d1 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
Mark Story
e080bb27b9 Merge pull request #411 from fitorec/2.0
Check the logic in the Shell::in($prompt, $options = null, $default = null)
2012-01-17 18:53:00 -08:00
Fitorec
ddbaa66997 Reviewing the logic in the Shell::in($prompt, $options = null, $default = null) 2012-01-15 21:16:45 -06:00
ADmad
389072708a Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
Kyle Robinson Young
51f9837db4 Code standards formatting 2011-12-15 22:52:07 -08:00
mark_story
07a2a60468 Merge branch '2.0' into 2.1 2011-12-13 22:03:40 -05:00
mark_story
dd335cb183 Fix error in FixtureTask
The options are always set, use empty() instead.

Fixes #2373
2011-12-13 20:40:30 -05:00
mark_story
2e8498e166 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
Kyle Robinson Young
c836ba08a3 Add/move docblocks to make text available in the API docs 2011-12-08 07:35:02 -08:00
mark_story
e7a7e57ba6 Fix bare require() to use App::uses()
Fixes #2346
2011-12-06 20:09:05 -05:00
Ceeram
e4e26a852b Making non-interactive behave same as interactive with odd table names 2011-12-05 17:00:48 +01:00
mark_story
6d269ce25d Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
Mark Story
d4fd1b3743 Merge pull request #348 from petteyg/apptheme
Make TemplateTask prioritize App templates over Core templates
2011-12-02 17:28:01 -08:00
Kyle Robinson Young
8197f87dbc Spelling and grammar fixes 2011-12-01 21:58:09 -08:00
Gordon Pettey (petteyg)
a800dcbbca Merge branch 'master' into apptheme 2011-12-02 02:29:43 +00:00
Ceeram
faddfbe2d0 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-12-01 20:30:45 +01:00
Ceeram
0a1772c929 adding default name, for dbs that dont expose a PK 2011-12-01 20:30:36 +01:00
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
Kyle Robinson Young
5876744709 Adhering to coding standards 2011-11-30 07:44:11 -08:00
Ceeram
57a1a2814d Fixing modeltask to use correct table
ModelTask will now bake correct primaryKey when not id
2011-11-29 00:00:00 +01:00
ADmad
73674c648c Moving AppShell inside Console/Command for consistency with file location of other App classes. Also making all core shells and tasks extends AppShell instead of Shell. Closes #2278 2011-11-26 02:48:49 +05:30
Rachman Chavik
204851842b In a multidb habtm, we cannot rely on 'joinTable'
Instead, we should use value from 'with' when it's available.
2011-11-25 22:29:23 +07:00
mark_story
4103fe14a2 Fix double / issue in ExtractTask
Also fix an issue where extracting pot files for plugins ended up creating
a Localedefault.pot file incorrectly.

Fixes #2284
2011-11-23 21:03:24 -05:00
mark_story
6d6ac10834 Fix failing tests caused by previous commit. 2011-11-20 23:00:58 -05:00
AD7six
adf73abb07 another bulletproofing for schemaless baking 2011-11-20 16:08:01 +01:00
AD7six
43ae7af17d prevent missing-index notices
when baking with a schemaless db
2011-11-20 15:44:44 +01:00
AD7six
f0fa6c7875 code standards 2011-11-20 01:17:07 +01:00
AD7six
8e38f666b7 allow baking models with missing tables - even for rdbms
test updated to reflect expected new expected behavior. If you bake a
model with the table missing, if forced to run skip any part of the
process that would result in an exception.
2011-11-20 01:11:33 +01:00
AD7six
ac8e1e8304 allow creating models without the table existing
particularly useful/appropriate for schemaless datasources
2011-11-19 23:51:39 +01:00
Gordon Pettey (petteyg)
99e6072fd3 Make App::path('Console') overwrite App::core('Console') for themes 2011-11-18 05:00:45 +00:00
mark_story
8981f49bd5 Add stricter validation to TestTask.
Empty classnames, and classnames without the correct type suffix
are no longer accepted.  They did the wrong thing anyways.

Fixes #2267
2011-11-16 20:38:31 -05:00
Renan Gonçalves aka renan.saddam
2a33bc862a Merge pull request #296 from majna/2.0-dbconfig-task
Fix for 'datasource' key when baking another db config.
2011-11-07 01:58:54 -08:00
Majna
57afa1873e Make View task use prefixed template before falling back to generic one. It is possible now to create view templates for different prefixes. 2011-11-07 01:01:56 +01:00
Mark Story
db41a7dd16 Merge pull request #302 from majna/2.0-viewtask-methods
Fix View task generating only 'admin' methods views in non-interactive mode.
2011-11-06 12:59:38 -08:00