Commit graph

722 commits

Author SHA1 Message Date
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
ADmad
d6c2df7b6b Display exact PDO error on default homepage 2013-01-12 11:30:25 +05:30
euromark
11a88042bd fix doc block endings 2013-01-11 15:06:54 +01:00
mark_story
d0d13acaf4 Merge branch 'master' into 2.3 2013-01-08 20:15:46 -05:00
AD7six
967526540a app/Console/cake is not pwd sensitive
the app dir does not need to be guessed based on the pwd - derive
from the path to the executable
2013-01-06 22:09:07 +01:00
and-ers
c72c612625 Replaced simple and therefore pointless array_push function references with the ordinary way of adding an array element. This will increase the performance and the code looks much cleaner this way IMHO 2013-01-02 23:47:27 +01:00
Graham Weldon
a9293aa385 Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
	lib/Cake/Console/Templates/skel/Config/core.php
2012-12-27 22:42:18 +09:00
Ceeram
f792136c26 adding a note about custom error handler classes 2012-12-27 13:18:52 +01:00
Ceeram
3f4d24bfc0 remove unused local variables and a few improvements 2012-12-23 13:53:13 +01:00
Jose Lorenzo Rodriguez
bcda684ad7 Copying changes doe to cake executable to skel files 2012-12-23 00:23:01 +01:00
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
ADmad
5aa9c26fdf Update doctypes to html5 2012-12-23 02:57:30 +05:30
Ceeram
6672eafe53 fix whitespace errors 2012-12-21 16:05:32 +01:00
Vinícius Krolow
c724f0739a Clean up code.
* It is not need to check the same thing twice
* One if condition instead of two ifs
* Ternary codition instead of checking if variable is null
* Returning early to avoid unnecessary conditional levels
* It is not needed to put an else as the if before already has returned
* Changing ternary conditional to PHP 5.2
* Removing some not needed conditions in the if, also changed to return false (instead of NULL) to follow the code block docs
* Changing to check before if the class_exists so we make sure that class was autoloaded before the condition

Squash of commits in https://github.com/cakephp/cakephp/pull/1034
2012-12-20 20:31:04 -05:00
mark_story
b346227d10 Fix issues with paths + spaces. 2012-12-19 17:35:56 -05:00
mark_story
fe2f56e8bd Fix path resolution when app dir has been renamed.
This solves path resolution when the default app dir has bee
renamed, and a relative path is used to run `cake`

Fixes #3474
2012-12-18 20:31:57 -05:00
Mark
8febb71b67 Merge pull request #1003 from dereuromark/2.3-cache-prefixes
cache prefix for view cache to avoid collisions with domains/languages
2012-12-17 00:46:08 -08:00
mark_story
6f5ff4d7dd Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
2012-12-13 20:20:42 -05:00
euromark
32f2426001 cache prefix for view cache to avoid collisions with domains/languages 2012-12-11 12:54:16 +01:00
Simon Males
693ca5481e Testing option value as a string 2012-12-10 23:02:51 +08:00
Simon Males
80773ad970 ConsoleOptionParser::_parseOption() tramples option values of 0 (zero). I believe the following condition is the culprit. 2012-12-10 22:13:38 +08:00
euromark
41f2d812bb fix ticket 3429 2012-12-03 12:31:56 +01:00
mark_story
35d67bf4a8 Merge branch 'master' into 2.3 2012-11-28 21:00:30 -05:00
ADmad
72d6ca636f Docblock fixes 2012-11-29 04:36:29 +05:30
Sethrin
c727444880 Fix behavior of --plugin param
Since plugins are not loaded in bootstrap, this is a good place to do it.
2012-11-26 22:13:01 -05:00
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
mark_story
587c7071b4 Fix incorrect order of arguments when added out of sequence.
Fixes #3385
2012-11-20 22:42:44 -05:00
Ceeram
e02eab05d5 Remove all todo from core, create tickets for them 2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3 fix all warnings except TODO warnings 2012-11-14 12:56:10 +01:00
euromark
8f78b1e05b fix coding standards for whitespaces 2012-11-14 12:24:08 +01:00
mark_story
e0aab77dab Merge branch 'master' into 2.3
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
Renan Gonçalves
929ed57844 Fixed TestShell options, removed space which caused the option to not be recognized. 2012-11-06 01:44:51 +01:00
Ceeram
aaf2d2ef71 fix remaining cs errors 2012-11-04 13:56:13 +01:00
ADmad
fa5ccf46d0 Fix coding standard errors 2012-11-04 02:52:00 +05:30
Jose Lorenzo Rodriguez
6c1bed3d26 Adding warning to home.ctp when DebugKit is not installed
Adding a list of official plugins to home.ctp
Removing old link to live.cakephp.org and replacing it with
plugins.cakephp.org
2012-11-03 15:57:22 +09:00
Kyle Robinson Young
f10c669813 Code standards fixes 2012-10-29 08:14:17 -07:00
Jose Lorenzo Rodriguez
8538c0e8ea Avoiding problems with relative paths in shell dispatcher 2012-10-28 12:57:44 +01:00
euromark
5324a8ca9c cleanup 2012-10-27 00:26:54 +02:00
Mark Story
d051b69312 Merge pull request #914 from dereuromark/2.3-i18n-extract
Normalize paths in generate pot files to always use /

Fixes #3306
2012-10-25 17:12:55 -07:00
Renan Gonçalves
02cfacec41 Make app/Console/cake pwd insensitive on Mac OS X.
Follow up of [36e15a065b].
2012-10-26 01:14:09 +02:00
euromark
f3bbe89ede solves ticket 3306 2012-10-25 17:08:52 +02:00
dogmatic69
641ba9f3e6 Merge branch '2.3' into type-checks
Conflicts:
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
mark_story
1aea9ac0c9 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Event/CakeEventManager.php
	lib/Cake/VERSION.txt
	lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04: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
mark_story
513851d1c1 Update skel directory logging configuration. 2012-10-13 02:29:25 -04:00
mark_story
e58c93c39d Fix trailing whitespace. 2012-10-01 21:21:53 -04:00
mark_story
a3ae58da09 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/View/View.php
2012-10-01 21:20:25 -04:00
Andras Kende
fa5d2c1941 removed 2 empty lines 2012-10-01 04:19:36 -07:00
Andras Kende
f5be83d452 formatting changes.. 2012-10-01 02:58:30 -07: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
mark_story
739b3b70f7 Update text in routes.php to clarify when to remove core routes. 2012-09-30 20:17:50 -04: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
mark_story
59e948fb1b Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
Mark Story
87fc86133c Merge pull request #873 from dereuromark/coding-standards
correcting coding-standards
2012-09-28 17:49:32 -07:00
James Michael DuPont
2d46fc60be Fixing undefined variable usage
Squash of pull request #872
2012-09-28 20:46:25 -04:00
euromark
b7f1740d2b correcting coding-standards 2012-09-28 13:49:51 +02:00
euromark
b47e3a7d92 move charset/App.encoding into CakeResponse 2012-09-27 20:28:19 +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
Renan Gonçalves
fe5b49e6eb Fixing variable name used to set error handlers. 2012-09-24 13:41:56 +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
d0bb8a94b4 die() to exit() 2012-09-15 11:20:51 +01:00
dogmatic69
f5a8eb6bbf ADmads comments 2012-09-14 19:57:51 +01: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
Renan Gonçalves
d33f676ddd Handling a fatal error on console should call Shell::_stop(1).
Just like we do on web, any exception or fatal error will result into a InternalErrorException/FatalErrorException.
2012-09-14 14:17:07 +02:00
mark_story
6664acba79 Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
Kyle Robinson Young
200dd2dc9b Code standards fixes, unneeded break statements 2012-09-04 11:30:52 -07:00
mark_story
5b641287e9 Make schema errors clearer.
When a schema fails because of the name, the error should display
the name & file name that it attempted to load. This gives people
a slightly better chance of figuring things out.
2012-09-03 21:06:48 -04:00
mark_story
bacd8afde3 Remove duplicated header. 2012-09-03 19:55:29 -04:00
mark_story
583bb37df0 Fix typo. 2012-09-03 13:10:27 -04: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
728300786b Merge branch 'master' into 2.3 2012-08-30 19:43:11 +01:00
mark_story
b27c8a05bd Make invalid short option error more helpful.
Refs #3157
2012-08-27 22:12:05 -04:00
mark_story
fba17cffe9 Move OptionParser initialization out of try block.
This allows exceptions that result from creating the optionparser to
display to the developer, making debugging easier.

Fixes #3157
2012-08-27 22:07:28 -04:00
Ceeram
abe74adf8a partial remove onlyAllow from baked code, only keep in delete to be rfc compliant 2012-08-26 15:00:49 +02:00
Ceeram
27d83eedfe use new onlyAllow() method in baked code, to ensure 405 responses have required Allow header included 2012-08-25 09:38:40 +02: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
7dae12456a Merge pull request #759 from dereuromark/2.3-cake-schema
2.3 cake schema
2012-08-10 18:11:50 -07:00
mark_story
4487673060 Merge branch 'master' into 2.3 2012-08-09 20:43:47 -04:00
euromark
5190b9f2c9 asserting that under_scored names result in valid ClassNames 2012-08-08 16:35:59 +02:00
euromark
62dee78ca5 adding models for schema generate 2012-08-08 14:15:28 +02:00
Justin A. Barnes
476bd80644 Fix cake bake project always finding CakePHP libs in php include_path.
Cake shell was adding the CakePHP libs to php include_path resulting in
producing baked projects without hardcoded CAKE_CORE_INCLUDE_PATH when
hardcoded CAKE_CORE_INCLUDE_PATH is needed.

Refs #GH-755

Signed-off-by: mark_story <mark@mark-story.com>
2012-08-07 20:52:37 -04:00
mark_story
dbe3234b56 Refactor help to show up on console -h as well. 2012-08-04 13:57:14 -04:00
mark_story
d7f1bf52b1 Fix route commands in ConsoleShell.
Apply patch from 'Ludovic Pouzenc' to fix route features in the console
shell.

Fixes #3096
2012-08-04 13:44:35 -04:00
mark_story
73b1c0ac1c Fix off by one error.
Fixes #3094
2012-08-03 23:34:44 -04:00
mark_story
e59555a66f Merge branch 'master' into 2.3 2012-08-03 22:45:56 -04:00
Rachman Chavik
5413b672eb use is_subclass_of instead of comparing Acl.classname 2012-07-28 15:00:17 +07:00
mark_story
d94cdc67fe Merge branch 'master' into 2.3 2012-07-27 22:38:24 -04:00