Mark Story
d000b3aa97
Merge pull request #601 from luisarmando/infoUpgrade
...
Outputs messages of which plugin is going to have locations upgrade.
2012-04-06 17:12:09 -07:00
Luís Armando
5b324f8024
Outputs messages of which plugin is going to have locations upgrade.
2012-04-06 18:06:18 -03:00
mark_story
475a1596b7
Merge branch '2.1' into 2.2
2012-04-01 15:37:21 -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
Jose Lorenzo Rodriguez
5a41024cf3
Removing hardcoded helper from PagesController in skel
2012-03-27 23:53:22 -04:30
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
Jose Lorenzo Rodriguez
b373309ba9
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-03-25 21:18:58 -04:30
Kyle Robinson Young
b8705a71fb
Remove no longer needed empty file
2012-03-24 21:46:32 -07:00
mark_story
34e1afd8ef
Add support for custom console error handling
...
Both errors and exceptions can be configured for the console
at the application layer now.
Fixes #2696
2012-03-22 20:52:49 -04:00
Ceeram
c9528b8446
Merge branch '2.1' into 2.2
2012-03-21 11:19:08 +01:00
mark_story
2bbf38038d
Remove duplicated code in testsuite shell.
2012-03-18 21:57:15 -04:00
mark_story
c58b61c17b
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/ModelWriteTest.php
2012-03-18 21:26:45 -04:00
ADmad
0832e18e9e
Adding separate error
layout for CakeErrorController as using default
layout often caused nested errors. Closes #2682
2012-03-18 14:05:41 +05:30
mark_story
5713cd3269
Fix the way bash is invoked.
...
Using /usr/bin/env is more portable to various *nix flavours.
Fixes #2688
2012-03-15 20:20:39 -04:00
mark_story
1254a1068f
Fixing issues with unwanted querystring parameters.
...
Because the request url was being appended as ?/$1 any nested
named parameters would be added as additional GET params. This is
yet another case where named parameters are fail. Modify the built-in
htaccess rules to not use a GET parameter at all, and just read
from REQUEST_URI.
Fixes #2678
2012-03-14 20:20:55 -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
Cauan Cabral
a3a2d55c94
Enable UpgradeShell to recognize new line between class name and {
2012-03-02 17:43:02 -04: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
mark_story
0568746bfd
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/CakeSchema.php
2012-02-26 12:04:28 -05:00
mark_story
d577d6b84e
Change cake.php to allow cake libs at ROOT
...
Splice the ROOT path into the include_path for console apps.
This allows users to override the system include_path with a local
version of CakePHP.
Fixes #2613
2012-02-26 12:03:22 -05:00
mark_story
2a9a103d62
Fix bad xml help generation.
...
Fixes #2619
2012-02-26 10:21:04 -05:00
mark_story
e958e6c25f
Fix strict and warning errors from type hints.
2012-02-25 20:06:48 -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
Rachman Chavik
b545d8b201
fix getSchemaName() for Sqlserver.
...
Closes #2609 .
2012-02-23 08:25:07 +07:00
Stef van den Ham
98b84ce40b
Fixed typo in TestSuiteShell
2012-02-22 09:38:59 +01:00
Kyle Robinson Young
22582aee63
Upgrade legacy uses of App::build() types
2012-02-18 04:31:29 -08:00
Mark Story
3e79038b06
Merge pull request #505 from shama/patch-htaccess
...
Remove extraneous space in .htaccess
2012-02-21 17:40:58 -08:00
Kyle Robinson Young
1312cdaedf
Remove extraneous space in .htaccess
2012-02-17 21:32:09 -08:00
Jose Lorenzo Rodriguez
ea79ba81a4
Adding a simpler solution to the missing view files problem without altering the built paths in App
2012-02-20 15:39:03 -04:30
Majna
0cd9a93e9e
Remove unused variables and statements.
2012-02-17 21:10:43 +01:00
Majna
1dbafe1d4f
Fix docblocks.
2012-02-17 13:51:20 +01:00
Kyle Robinson Young
45ec5d73c5
Add missing visibility keywords
2012-02-16 23:13:12 -08:00
ADmad
c7cfd45884
Syncing bake skeleton with app
2012-02-16 01:58:11 +05:30
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
b61f46b030
Add Console/Templates and webroot/files to bake skel. Update tests.
2012-02-07 18:51:04 +01: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
Dean Sofer
ff91a7978e
Added missing AppShell.php file to core
2012-02-05 01:47:56 -08:00
mark_story
07dc558fb1
Sync CSS file with app/webroot.
2012-02-04 11:03:01 -05:00
mark_story
5cf5ee4410
Clarify which cache is using the indicated engine.
2012-02-04 10:42:48 -05:00
slimus
7c08e4b0f4
Update lib/Cake/Console/Shell.php
2012-01-28 23:45:44 +07:00
slimus
57e4751a82
fix shell help for incorrect user input
2012-01-28 16:36:59 +07:00
mark_story
752711e963
Fix missing behavior constructor.
2012-01-27 21:10:57 -05:00
mark_story
fb7717c0da
Fix wonky tabs.
2012-01-27 20:59:03 -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
Ceeram
7eda0affe3
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/View/ThemeView.php
2012-01-26 21:40:18 +01:00
ADmad
00649cbdde
Updating minimum PHP version requirement to 5.2.8 due to PHP bugs #44251 and #45748 . Closes #2509
2012-01-26 17:56:42 +05:30
Ceeram
4f1be12046
Merge branch '2.1-appshell' into 2.1
2012-01-23 15:29:03 +01:00
Graham Weldon
64d4387c82
Added default prefix to cache configurations.
2012-01-23 10:43:21 +11:00
Jose Lorenzo Rodriguez
b9ad469a65
Merge remote-tracking branch 'origin/2.0' into 2.1
2012-01-22 15:52:54 -04:30
Yusuke Ando
b8d67e581a
Set encoding in CSS file.
...
Signed-off-by: mark_story <mark@mark-story.com>
2012-01-22 11:34:16 -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
5e495ad90c
Simplify how options are checked.
2012-01-17 21:57:22 -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
Mark Story
8608caa8a2
Merge pull request #298 from vitorpc/2.0
...
Property 'name' removed of PagesController.
2012-01-17 18:52:26 -08:00
Ceeram
828117583f
fix that argument with 0 as value will stop parsing args, tests added
2012-01-17 20:01:40 +01:00
Scott Harwell
153b9f9ee2
Updated to use camelize rather than classify
2012-01-16 20:52:05 -05:00
Scott Harwell
33dc57e667
Added check for duplicate methods to prevent fatal php error
2012-01-16 14:45:12 -05:00
Fitorec
ddbaa66997
Reviewing the logic in the Shell::in($prompt, $options = null, $default = null)
2012-01-15 21:16:45 -06:00
Mark Story
533feea2b1
Merge pull request #403 from rintaun/patch-2
...
$action in AclShell::_getParams() should default to '*', not NULL
2012-01-12 19:08:42 -08:00
mark_story
b6040aec5a
Update UpgradeShell for App classes.
...
Correctly move AppController and AppModel.
Fixes #2472
2012-01-12 21:37:34 -05:00
Ceeram
9f40e6de79
move AppShell to app/Console/Command directory
2012-01-12 11:55:10 +01:00
Matthew Lanigan
0e607bf880
$action in AclShell::_getParams() defaults to '*', not NULL
2012-01-11 21:59:58 -05:00
mark_story
79564fb7d4
Remove incorrect constant.
2012-01-07 20:10:14 -05:00
mark_story
72b9eb540e
Update core cake.php to match other versions.
...
This makes the pear package install play nice as well.
2012-01-07 20:05:11 -05:00
mark_story
15c7493e39
Merge branch '2.0' into 2.1
2012-01-06 23:02:16 -05:00
Simon Males
adc6846145
schema update fails with -f flag, although it's supported.
2012-01-05 16:54:02 +11: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
mark_story
0b0a69de1e
Update default layouts to use blocks.
2011-12-17 22:23:37 -05:00
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
Graham Weldon
d83115927d
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-12-14 16:04:40 +11:00
mark_story
07a2a60468
Merge branch '2.0' into 2.1
2011-12-13 22:03:40 -05:00
mark_story
b61e3e0378
Fix lies in Shell::createFile()
...
It could lie if the file was not writable.
Fixes #2371
2011-12-13 21:59:58 -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
Rachman Chavik
90af608489
keep existing data in unique HABTM closes LH 275
...
ported to 2.0 branch from cakephp/cakephp#93
2011-12-12 18:09:02 +07: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
mark_story
205bfb506f
Add Shell::$plugin and update getOptionParser()
...
Adding a plugin property allows the correct
usage/help information to be generated.
Fixes #2359
2011-12-10 21:31:21 -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
Kyle Robinson Young
1e1c7a036d
Code consistency formatting tweaks
2011-12-06 12:52:48 -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
545f4d2811
Fix bad merge.
2011-12-03 13:56:55 -05: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
mark_story
0f71254fe1
Fix double inflection in bake all <foo>
...
ViewTask re-pluralizes the model name. Sometimes this leads to
things like Menuses which is totally wrong.
Fixes #2318
2011-12-01 20:41:17 -05: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
Majna
87a3937def
Add visibility keyword for 'helpers' property in controller template.
2011-11-30 20:06:07 +01:00
Kyle Robinson Young
5876744709
Adhering to coding standards
2011-11-30 07:44:11 -08:00
Graham Weldon
af2e7c1e9b
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
2011-11-29 23:00:47 +11:00
ADmad
c653d8361f
Merge pull request #341 from andraskende/master
...
removing $i as its no longer being used here.
2011-11-28 23:59:39 -08:00
Andras Kende
4f64a9f6cd
removing $i as its no longer being used here. (probably was used before on zebra striping.)
2011-11-28 23:33:55 -06:00
Jose Lorenzo Rodriguez
76e334ca38
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-28 22:30:36 -04:30
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
Rachman Chavik
fa80be50eb
Removing timestamp lines from generated files
...
This causes unnecessary diff chunks, and we should depend more on
the SCM instead of these values.
2011-11-25 08:45:33 +07:00
Rachman Chavik
211146fb7a
Enable short option for --plugin and --connection
...
This is done to make things more consistent with the bake shell
2011-11-24 19:29:27 +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
Kyle Robinson Young
bb51b0f497
Add @link to Shell docblocks
2011-11-21 21:33:07 -08:00
Mark Story
340d112693
Merge pull request #327 from bigclick/patch-1
...
Fix for when trying to use "Console/cake schema generate snapshot"
2011-11-21 07:20:07 -08:00
mark_story
6d6ac10834
Fix failing tests caused by previous commit.
2011-11-20 23:00:58 -05:00
bigclick
037f2c016e
preg_quote'd $fileName to avoid issues when using a special character in their schema filename
2011-11-21 13:19:57 +11:00
bigclick
7a68f7fed1
Fix for when trying to use "Console/cake schema generate snapshot" command, line 67 was making the name param snapshot, also fixed auto numbering in the case where the filename wasn't "schema"
2011-11-21 11:43:51 +11: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
ADmad
90b007ef75
Implemented priority based triggering of callbacks for objects in collection
2011-11-17 12:36:54 +05:30
mark_story
fa0ec44dfd
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
lib/Cake/Test/Case/Error/ExceptionRendererTest.php
lib/Cake/Test/Case/Utility/DebuggerTest.php
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
2011-11-16 21:31:16 -05: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
mark_story
542e5c91de
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2011-11-15 23:11:07 -05:00
mark_story
fb7d931bef
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-15 23:10:34 -05:00
Graham Weldon
eefdc43214
Fix plugins not being loaded before looking for pluign paths
2011-11-15 17:30:49 +11:00
ADmad
233a63366f
Syncing files between app directory and bake skeleton
2011-11-14 02:32:59 +05:30
mark_story
0a0a09920b
Updating for PHP5.4
...
- Fixing strict errors.
- Fixing call time pass by reference as its been removed in PHP5.4
- Fix assign new as a reference, which has been removed.
2011-11-12 21:42:19 -05:00
mark_story
254357e9c9
Merge branch '2.0' into 2.1
2011-11-11 22:38:11 -05:00
mark_story
99caa98df3
Update message for PHPUnit3.6
2011-11-11 21:28:34 -05:00
Ceeram
767d1afcd8
fixing helptext for AclShell
2011-11-09 21:07:01 +01:00
Mark Story
e8e2bbc4d7
Merge pull request #304 from jamiemill/2.0-upgradefix2
...
Add exception migration to the upgrade shell.
2011-11-08 06:47:52 -08: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
jamiemill
e16890225c
Fixed mistake in UpgradeShell::exceptions()
...
My fault ;)
2011-11-06 23:19:30 +00:00
jamiemill
c966a35beb
Fixed bug in UpgradeShell::findFiles().
...
$this->_files was reset on each loop through paths, which means, for
example, if you still had the old 'views' directory kicking around
the results from 'View' would be overwritten.
2011-11-06 21:53:20 +00:00
jamiemill
4368b62dfb
Added an 'exceptions' method to the UpgradeShell.
...
This just replaces some of the basic cakeError() calls with
equivalent exceptions.
2011-11-06 21:53:11 +00:00
jamiemill
1d52dc05e1
Fix for UpgradeShell::helpers() not discovering core helpers.
2011-11-06 21:53:03 +00:00
Mark Story
6fd69b022d
Merge pull request #303 from shama/patch-1
...
Remove 5.3 notice from Config/core timezone comment
2011-11-06 13:47:31 -08:00
mark_story
d87f9f060b
Make parent method check explicit to Shell.
...
This makes only methods on Shell inaccessible on the command line.
Parent methods in AppShell or other parent classes can now be called directly.
Fixes #2193
2011-11-06 16:32:51 -05:00
Kyle Robinson Young
b2414a777f
Remove 5.3 notice from lib/Cake/Console/Templates/skel/Config/core timezone comment
2011-11-06 13:17:07 -08: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
mark_story
aae8a89623
Change var -> public in controllertask.
...
Makes the confirmation message and generated code the same.
Fixes #2216
2011-11-06 11:50:16 -05:00
mark_story
a2b6f18000
Merge branch '2.0' into 2.1
2011-11-06 11:39:01 -05:00
mark_story
cfe38985cf
Fix failing tests caused by changes in App::objects()
2011-11-06 11:23:11 -05:00
Majna
d84b66e744
Fix View task generating only 'admin' methods views in non-interactive mode.
2011-11-06 16:14:55 +01:00
ADmad
e1354b2ee6
Merge branch '2.0' into 2.1
2011-11-06 20:39:08 +05:30