Commit graph

633 commits

Author SHA1 Message Date
Rachman Chavik
8e8763d69d change to match syslog levels & customizable levels 2012-05-13 18:51:57 +07: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
Mark Story
5d3291ba19 Merge pull request #645 from huoxito/2.2
Make controller test template extends ControllerTestCase instead of CakeTestCase
2012-05-11 17:35:34 -07:00
Washington
287c7b432a fix broken tests for TestTask class 2012-05-11 15:30:47 -03: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
Rachman Chavik
e5b33627d5 minor updates to the logging changeset
- change usage of Set to Hash
- updating bootstrap.php
- adding docblocks
- avoid silencing unlink errors in tests
2012-05-11 21:19:45 +07:00
Rachman Chavik
bb090c54cf changing Shell to use ConsoleLog 2012-05-11 12:37:00 +07:00
Rachman Chavik
5c4f741529 add default logging config in Config/bootstrap.php 2012-05-11 12:37:00 +07:00
Washington
a238116734 make controller test template extends ControllerTestCase 2012-05-10 20:34:30 -03:00
AD7six
6933b31be5 include plugin name in model tests 2012-05-11 00:33:10 +02:00
AD7six
6aca8036f4 baked tests match code standard by default 2012-05-10 23:51:22 +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
39a53fe0e2 updating model bake tempalte to meet code standards 2012-05-10 00:44:03 +02:00
AD7six
5b507636c7 baked controller code generates no errors 2012-05-10 00:37:51 +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
AD7six
5ef2a0100b code standard fix
the baked test must have a blank line inbetwen the last function and the
end of the class
2012-05-09 23:38:29 +02:00
AD7six
d1f522e53a attempt to get baked code output closer to phpcs standard 2012-05-09 23:38:29 +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
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
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
AD7six
6b6fdd2b84 don't dump fatal errors as html on the cli 2012-04-29 16:25:07 +02:00
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07: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
Ceeram
74ee75b0ef Merge branch '2.1' into 2.2 2012-04-23 10:34:04 +02:00
Kyle Robinson Young
89d3221adc Update available App::build settings in bootstrap 2012-04-22 21:16:00 -07:00
Jose Lorenzo Rodriguez
ed0c5a4746 Merge branch '2.2-lazy-helpers' into 2.2 2012-04-22 20:40:11 -04:30
Jose Lorenzo Rodriguez
8465538800 Merge branch '2.2-middleware' into 2.2 2012-04-22 17:17:36 -04:30
euromark
bc2cd00123 cake 2.2 test case fixes (assert corrections, correct class names) 2012-04-21 15:02:35 +02:00
mark_story
c49da62c23 Update content_for_layout to use fetch()
Fixes #2803
2012-04-18 22:23:18 -04:00
mark_story
21ba5bf04a Merge branch '2.1' into 2.2 2012-04-17 21:47:24 -04:00
mark_story
e54e494b4b Syncing app/webroot/index.php + skel directory.
Refs #GH-607
2012-04-17 20:45:59 -04:00
Jose Lorenzo Rodriguez
826699a670 Extracting asset dispatcher and cache dispatcher into separate classes to provide examples on how to use Dispatcher
Filters
2012-04-17 00:42:18 -04:30
Juan Basso
9beaa9602f Unified error handlers. Now the regular error handler will receive the fatal errors too. 2012-04-14 16:08:36 -04:00
Juan Basso
a72288c378 Fixing doc. 2012-04-14 16:08:36 -04:00
Juan Basso
05cdae6d1a Renamed fatal error handler configuration for follow the same logic of consoleHandler name. 2012-04-14 16:08:36 -04:00
Juan Basso
1428659f88 Moved the fatal error detection to App::shutdown and keeping the fatal error handler cleaner. It helps to be extended by applications/plugins. 2012-04-14 16:08:35 -04:00
ADmad
4e1a2670da Updating outdated layout file in skeleton 2012-04-14 19:22:52 +05:30
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
a24aca6ffc Fix a few code standards errors. 2012-04-06 22:56:01 -04:00
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