mark_story
cc5795c67d
Merge branch 'master' into 2.5
2013-09-26 10:07:10 -04:00
Bryan Crowe
915b51b239
Updated JavaScript casing and JsHelper references in doc blocks
2013-09-25 22:46:38 -04:00
euromark
0ae69aace9
App::import to App::uses
2013-09-25 19:40:14 +02:00
euromark
653aed7701
is_a() to instance of - completes PR 1669
2013-09-24 22:57:51 +02: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
12f2f729c8
more cs
2013-09-17 14:53:07 +02:00
euromark
382f75dbfc
cs corrections, bool to boolean and int to integer.
2013-09-17 14:44:34 +02:00
mark_story
a2bd91638e
Merge branch 'master' into 2.5
2013-09-12 19:47:13 -04:00
euromark
a796b26f13
fix renderLayout and update deprecated and outdated code
2013-09-13 00:09:31 +02:00
ADmad
c27aa99af9
Merge branch 'master' into 2.5
2013-09-08 20:36:40 +05:30
mark_story
f22c4cf90b
Merge branch 'master' into 2.5
2013-09-05 10:21:41 -04:00
ADmad
29d0e26710
Dropping 'Log' suffix from log configs as per change in cb24dbb084
.
...
Reverts regressive change done in 7e28636a72
.
2013-09-05 19:37:41 +05:30
Hadrien Collongues
7e28636a72
Fix log classname in skeleton
...
Fixes "logger class File does not implement a write method."
It probably tries to use the utility File class instead of the logger
2013-09-05 11:20:39 +02:00
Marc Würth
84a669aa7a
Shortened the if clause line length by doing it the @markstory style ;-)
...
Also shortened the line length of some arrays
2013-09-02 20:38:31 +02:00
mark_story
59bb05b433
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-09-02 11:35:09 -04:00
Matt Reishus
bb98ac761f
ConsoleInput::_canReadLine change from private -> protected
2013-09-01 17:15:51 -05:00
Matt Reishus
3b057cb82b
Correct style
2013-09-01 16:58:23 -05:00
Matt Reishus
916d992162
Use readline in console when supported
...
$this->stdin->read(); will use readline if the system is detected to
support it. In linux, you will be able to use the left and right arrow
keys to edit the current line, use the up and down keys to navigate
history, press ^U to delete the entire line, etc.
Before this, using arrow keys in linux will just spam characters like
^[[C^[[A^[[D^[[C^[[A^. Useful for "Console/cake console"
2013-09-01 16:20:29 -05: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
Mark Story
824a6f700b
Merge pull request #1563 from mvdriel/fix-i18n-extract
...
Extract category strings to separate .po files
2013-08-30 12:19:17 -07:00
Mark van Driel
256e1f6532
Removed unused variable
2013-08-29 10:49:23 +02: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
cce1fafd80
Fixed typo in comments
2013-08-28 18:49:34 +02:00
mark_story
f18d354f55
Merge branch 'master' into 2.4
2013-08-28 12:35:07 -04:00
Mark van Driel
ed10c3332d
Fixed typos in text and comments
2013-08-27 21:12:03 +02:00
Andras Kende
17f9661961
Added mask to File cache docblock
2013-08-27 10:02:48 -04:00
Mark van Driel
c4ec8bedd0
Fixed category constant values: constants in Cake don't use the same values as PHP (Linux)
2013-08-27 12:30:39 +02:00
Mark van Driel
1fd936f3cc
Fixed cross-platform issue: LC_* constants have different values on windows
2013-08-27 10:51:00 +02:00
Mark van Driel
88d7fbeb53
Extract category strings to separate .po files
2013-08-25 23:04:05 +02:00
euromark
1aba204ec7
remove $name where not necessary to unify this in 2.x
2013-08-25 21:19:55 +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
José Lorenzo Rodríguez
8e21e255dc
Merge pull request #1543 from dereuromark/2.4-translations
...
remove code, class names and paths from translation strings.
2013-08-20 15:33:42 -07:00
euromark
361980fade
remove code, class names and paths from translation strings.
2013-08-21 00:05:53 +02:00
mark_story
6d80d6a3cb
Add missing return.
2013-08-20 18:03:52 -04:00
mark_story
67855896ef
Remove invalid code.
...
Fixes #4002
2013-08-20 11:34:30 -04:00
euromark
5ed9e5d691
sync and correct generic css
2013-08-19 21:51:04 +02:00
mark_story
9ea2926bf3
Merge branch 'master' into 2.4
2013-08-19 10:40:29 -04:00
mark_story
f7a81a9aee
Conditionally define constants in the CLI environment.
...
Only define constants if they don't already exist. Users can modify
`app/Console/cake.php` and define constants before this code executes.
Fixes #4000
2013-08-19 10:40:09 -04:00
mark_story
0f2d59d987
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Network/CakeResponse.php
lib/Cake/TestSuite/CakeTestCase.php
2013-08-18 23:10:08 -04:00
mark_story
675f828e16
Remove insertQuery and deleteQuery.
...
These properties were never implemented and are misleading when people
try to use them.
Closes #3997
2013-08-18 21:37:37 -04:00
mark_story
3244b9e3d7
Merge branch 'master' into 2.4
2013-08-16 14:47:01 -04:00
euromark
6cf147e8c8
unify null checks - avoid method call in favor of strict check
2013-08-16 20:12:49 +02:00
Andras Kende
3f58be260e
removed not used $i variable
...
removed not used $i variable
2013-08-13 22:06:00 -07:00
euromark
759c24e660
correct doc blocks as per cs
2013-08-13 12:29:20 +02:00
mark_story
26769edd04
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Utility/CakeTime.php
lib/Cake/VERSION.txt
2013-08-12 14:39:02 -04:00
Mark Story
2f5963e2d3
Merge pull request #1496 from ravage84/else-clause-after-redirect
...
Removed else clauses after redirects and added return before redirect() ...
2013-08-12 11:05:39 -07:00
euromark
f3018cc532
refactor methods to avoid else block on returning early
2013-08-12 19:06:34 +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
ADmad
8150b89aba
Allow setting path constants in app/Console/cake.php as you can in webroot/index.php
2013-08-12 00:54:50 +05:30
mark_story
86dcebf28b
Update bakeshell so bake all
gets the correct connection name.
...
Fixes #3972
2013-08-09 10:08:01 -04:00
Marc Würth
4c13a39f3e
Removed else clauses after redirects and added return before redirect() and flash() calls
2013-08-08 21:10:41 +02:00
dmromanov
af48904117
Combined strings of Testsuite Shell's description to a one translatable sentence.
2013-08-08 00:28:38 +04:00
D. Romanov
4d3c049f25
Do not translate "CakePHP"
2013-08-07 22:54:19 +04:00
U-Zyn Chua
d9b99d0599
Fixes a bug where server would not run when there are spaces in documentRoot.
2013-08-06 15:19:59 +08:00
ADmad
38b050a711
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
2013-08-04 19:26:55 +05:30
ADmad
a2e818e509
Deprecated ConsoleShell
2013-08-03 03:04:32 +05:30
Andy Dawson
d7bc432202
Merge pull request #1468 from cakephp/feature/fix-console
...
Fix the console cli
2013-08-02 04:22:21 -07:00
mark_story
5bd45ec65d
Fix double printing of models in ConsoleShell.
...
Fixes #3952
2013-08-01 08:50:02 +00:00
AD7six
69be4bb1e8
Update the console shell for easier maintenance
2013-08-01 08:39:01 +00:00
mark_story
1202456ef2
Fix errors in ConsoleShell.
...
The switch statement was failing to evaluate conditions properly and
always attempted to run the bind command.
2013-07-31 23:51:30 -04:00
mark_story
810fd28186
Fix double printing of models in ConsoleShell.
...
Fixes #3952
2013-07-31 23:41:49 -04:00
ADmad
61bf8df454
Renaming base url config keys and methods for better uniformity.
2013-08-01 00:44:36 +05:30
ADmad
b22b39f158
Deprecate constants IMAGES_URL, CSS_URL, JS_URL and add corresponding config values instead.
2013-07-31 18:31:26 +05:30
Marc Würth
4a37ad5637
Added return before redirects
...
As recommended by the Cookbook:
http://book.cakephp.org/2.0/en/development/testing.html#testing-controllers
> When testing actions that contain redirect() and other code following the redirect it is generally a good idea to return when redirecting. The reason for this, is that redirect() is mocked in testing, and does not exit like normal. And instead of your code exiting, it will continue to run code following the redirect.
2013-07-28 23:44:07 +02:00
mark_story
c28cde4e56
Update webroot files to fix an issue in ServerShell.
...
The previous fixes done in 2918ae9c7a
caused other issues preventing actions from being dispatched properly.
Fixes #3934
2013-07-27 17:01:35 -04:00
Phally
6b41eaa950
Merge branch 'master' into 2.4
2013-07-26 19:44:11 +02:00
Phally
881e757a1e
Paths for App::build() require trailing /.
2013-07-22 13:51:09 +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
euromark
0b6919ee94
force option for bake tasks (view, model, controller, test, fixture)
2013-07-18 13:09:00 +02:00
ADmad
d161b21ae1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
2013-07-14 10:58:55 +05:30
Mark Story
4774d62e7f
Merge pull request #1416 from majna/2.4-pages
...
Pages controller should render 404 on missing view file
2013-07-13 17:05:14 -07:00
Mark Story
8ad1f00ae4
Merge pull request #1417 from cakephp/feature/2.4-simpler-rewrite
...
use a simpler rewrite rule
2013-07-13 17:03:56 -07:00
AD7six
6b66aee138
use a simpler rewrite rule
...
The capture group isn't used - so don't captuer it
There are no get args in the rewrite rule so there's no need to
request appending the existing get args - they are unmodified.
2013-07-13 16:18:48 +00:00
Majna
1ce9fc537f
Pages controller should render 404 on missing view file
2013-07-13 17:41:16 +02:00
Mark
f9fdc1e6e0
Merge pull request #1408 from dereuromark/master-cleanup
...
remove @access and unnecessary $name
2013-07-12 07:10:23 -07:00
mark_story
cfa260d8c5
Update ServerShell to use provided documentRoot.
...
Fix ServerShell from using the wrong path to the routing script when
a custom document root is used. Thanks to Marko Marković for the patch.
Fixes #3909
2013-07-09 21:10:37 -04:00
mark_story
2918ae9c7a
Update index.php to serve static files with query strings.
...
Trim off the query string before attempting to locate the file on the
filesystem. Thanks to Marko Marković for the initial patch.
Fixes #3910
2013-07-09 21:07:12 -04:00
Rachman Chavik
542d594b86
Fix deprecated value in argument and disable caching
...
This aligns better with changes required in the 3.x branch.
Related: 4bb0a122
2013-07-08 21:55:14 +07:00
euromark
a643295e4c
remove @access and unnecessary $name
2013-07-08 15:50:50 +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
af455b4121
correct return types in doc blocks
2013-07-05 17:19:22 +02:00
euromark
e7f380d2b7
doublespace to single space
2013-07-05 14:36:40 +02:00
mark_story
c597855fe4
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Network/CakeRequestTest.php
2013-07-03 14:21:09 -04:00
euromark
f389435bae
coding standards and else block simplification
2013-07-03 19:27:17 +02:00
euromark
7cb19b97db
coding standards and simplification of else cases as well as some minor fixes
2013-07-03 00:52:48 +02:00
Mischa ter Smitten
dad1f16eaf
Made _stop() usage in Consoles / Tasks more consistent
2013-07-01 14:15:54 +02:00
mark_story
f09693f6e8
Merge branch 'master' into 2.4
2013-06-29 23:26:26 -04:00
Marc Würth
2609016dfe
Changed http links to lighthouse, groups.google and github to https
...
Because they get redirected anyway and we should follow good practices.
Also in many cases similar URLs were already using https
2013-06-25 22:58:30 +02:00
euromark
8141dd2d5d
unify other log types as well
2013-06-21 16:43:01 +02:00
euromark
b6a2c2a982
update bootstrap config
2013-06-21 16:38:25 +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
42777b7809
incorrect tab to space - whitespace coding standards
2013-06-09 21:01:01 +02: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
Arnold Almeida
dacf7e0ebe
Update FixtureTask.php
...
Using err() does not stop shell output when used in the context of a script.
Also no nice color syntax to indicate that there was an error with one of the fixture generations.
Using error() fixes that.
2013-06-07 14:21:35 +08:00
José Lorenzo Rodríguez
3b4a4fde31
Merge pull request #1317 from lorenzo/feature/full-base-url
...
Adding App.fullbaseURL as a recognized Configure value
2013-06-05 15:12:27 -07:00
Kim Egede Jakobsen
6c3a63ea9b
Correct small typos.
2013-06-05 09:57:18 +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
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
Jose Lorenzo Rodriguez
4bc92b822e
Adding App.fullbaseURL as a recognized Configure value
2013-05-30 16:07:26 +02:00
Christian Winther
2eb9841c54
Add short option for theme in BakeShell
2013-05-29 13:49:51 +00:00
Christian Winther
5aac41ed43
Fix indentation and add short option 't' for template
2013-05-29 13:49:12 +00:00
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
Marc Würth
29cc6b3652
Fixed or removed some package/subpackage definitions to reflect directory structure
...
Lowercase cake instead of Cake
Tests instead of Test
Fixtures instead of Fixture
2013-05-29 15:00:18 +02:00
Mark Story
05f58a700c
Merge pull request #1306 from Jippi/hotfix/notice-should-be-styled-too
...
Adding color output for notice / LOG_NOTICE in ConsoleOutput
2013-05-28 09:07:34 -07:00
Christian Winther
4752fcd713
Adding color output for notice / LOG_NOTICE in ConsoleOutput
2013-05-28 11:59:37 +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
mark_story
df872dde28
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-05-10 21:58:48 -04:00
Daniel Hofstetter
dae978fb3a
Split sentence into two sentences
2013-05-09 10:22:43 +03:00
mark_story
cdede82b7e
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Core/Object.php
2013-05-07 22:22:48 -04: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
mark_story
eee37bb04e
Improve docs for AclShell.
2013-05-07 21:58:57 -04: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
fab5a6f4d9
spelling corrections
2013-04-30 14:11:50 +02:00
euromark
09d9efe235
spelling corrections (a url to an URL, unify URL)
2013-04-29 11:05:17 +02:00
mark_story
8b9dea5f52
Merge branch 'master' into 2.4
2013-04-24 21:59:10 -04:00
ADmad
ede33dbee4
Fix coding standard error
2013-04-25 03:19:40 +05:30
ADmad
19f8274a95
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-04-25 03:06:04 +05:30
mark_story
e144afead7
Fix Vendor/bin/cake not working when installing CakePHP with composer.
2013-04-24 14:43:47 -04:00
Marc Würth
993ec1fed6
Fixed some typos in core.php
...
In sync with this one https://github.com/cakephp/cakephp/pull/1244
2013-04-23 21:50:26 +03:00
ADmad
06a5c509c0
Merge branch 'master' into 2.4
2013-04-21 19:15:55 +05:30
Rachman Chavik
331580bbad
Removing stray whitespace
2013-04-18 21:33:23 +07:00
Rachman Chavik
051fc0c140
Remove copyright information from bake templates
2013-04-18 21:28:06 +07:00
Simon Males
9c113247de
Avoid noticed that TMP is defined. Can be possibly defined in cake.php
2013-04-17 15:06:24 +08:00
mark_story
d01d291d13
Remove unused define.
...
The LOG_ERROR constant is no longer used by the logging system. It is an
unused relic from 1.x. Additionally changing the value of ERROR to not
be error creates counterintuitive code.
Fixes #3762
2013-04-16 12:32:00 -04: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
Rémi Dewitte
c70a3868a9
schema update CREATEs non-existing tables instead of ALTER
2013-04-03 17:37:09 +02:00
mark_story
041c2d289f
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Shell.php
2013-03-26 20:31:54 -04:00
ADmad
9d367e1add
Fix docblock of bake template
2013-03-27 00:12:24 +05:30
José Lorenzo Rodríguez
8c9a16ab9f
Merge pull request #1186 from ceeram/2.4-blacklist
...
2.4 blacklist
2013-03-26 07:35:43 -07:00
Ceeram
6bf9363217
Add option to skip exception types for logging.
...
add blacklisting for logging exceptions
add test for skipping exception logging, and fix typo and cs
add example to docblock in core.php for skipLog
remove app_error.php skips, those are no longer used in 2.x
use assertContains instead of assertRegExp
check for instanceof, instead of matching names
2013-03-26 15:11:39 +01:00
mark_story
d1d3bcff04
Move import to top of file.
2013-03-20 20:37:13 -04: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
026df62a1f
Merge branch 'master' into 2.4
2013-03-12 09:41:37 -04:00
mark_story
f1da6b4cbc
Disable the cache when running schema commands.
...
This prevents stale cached schema definitions from preventing updates.
Fixes #3690
2013-03-11 13:10:14 -04:00
euromark
ab1f81b9a6
Add missing App::uses to prevent fatal error
2013-03-11 12:59:44 +01:00
mark_story
8209097bc3
Merge branch 'master' into 2.4
2013-03-09 12:40:59 -05:00
mark_story
3b7b322d41
Update API links.
2013-03-05 20:58:03 -05:00
Adam Taylor
433dd09ec4
Fix typos
2013-03-05 00:05:14 -07: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
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
Kyle Robinson Young
85862bbb9f
Lazy load models in shells.
2013-02-28 20:30:06 -08:00
mark_story
1d529c1dd2
Add type hints in SchemaShell.
...
I'm trying to figure out what's going on in the failing travis builds.
2013-02-28 22:54:31 -05:00
mark_story
d1c88ebf8a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Log/Engine/FileLog.php
lib/Cake/Utility/Validation.php
lib/Cake/View/Helper/HtmlHelper.php
2013-02-24 20:24:26 -05:00
euromark
eb49c4b666
proper response and response code (404 instead of 200)
2013-02-22 10:36:05 +01:00
José Lorenzo Rodríguez
fd7158c108
Merge pull request #1119 from ravage84/patch-2
...
Adjusted link for my docs-patch
2013-02-16 06:12:48 -08:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
ADmad
ee4a116936
Fix coding standards
2013-02-10 12:51:22 +05:30
ADmad
13029cc2bc
Merge branch 'master' into 2.4
2013-02-09 02:20:16 +05:30
Marc Würth
514d9675d8
Updated .gitignore, synced app & skel
...
Added some good practice rules from https://help.github.com/articles/ignoring-files to gitignore
Changed .gitignore to only ignore /app/Config/database.php instead of all files in /app/Config/ (helps to keep it in sync with its skel folder!)
Brought \app\ and \lib\Cake\Console\Templates\skel\ in sync
Fixed various @package annotations in \app\
Fixed various @package annotations in \lib\Cake\Console\Templates\skel\
2013-02-08 15:54:36 +01:00
Graham Weldon
26a08c6780
Updated copyright
2013-02-08 21:28:17 +09:00
Graham Weldon
97a60c28c7
Updated copyright and added references to license file for non-standard copyright references
2013-02-08 21:26:18 +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
95bc8be4d5
Make path to router script absolute in server shell.
...
Relative paths fail when you run the server from inside app/Console
or any other path.
2013-02-07 20:32:26 -05:00
mark_story
1ceb17589a
Merge branch 'master' into 2.4
2013-02-06 21:05:03 -05: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
Marc Würth
94ca499dec
Brought home.ctp in skel folder in sync
2013-02-06 03:16:48 +01:00
Marc Würth
72765a2afc
Brought \app\Config and \lib\Cake\Console\Templates\skel\Config in sync
2013-02-03 20:00:32 +01:00
ravage84
af8b1e22ef
Added a note about plugin assets not working witout url rewrite
...
http://cakephp.lighthouseapp.com/projects/42880/tickets/25-i-installed-but-dont-see-the-images-and-css-of-debugkit
> Plugin assets do not work without url rewriting, this is in the
documentation for CakePHP itself. I guess it could be repeated for this
and every other plugin.
> I could have sworn it was with the Plugin Assets section, but
apparently its not there. Perhaps its just something I know from
experience.
See also:
* http://cakephp.lighthouseapp.com/projects/42648/tickets/1755-plugin-webroot-without-mod_rewrite-problem
* http://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/500-plugin-css-directories-bug#ticket-500-8
Signed-off-by: mark_story <mark@mark-story.com>
Refs #GH-1113
2013-02-03 13:12:29 -05:00
Mark Story
80b8e7d98b
Merge pull request #1112 from djbobke/2.4-dataavailable-squash
...
Backported dataAvailable to 2.4 from 3.0
2013-02-02 08:04:03 -08:00
Rik van der Heijden
67a2276763
Backported dataAvailable to 2.4
2013-02-02 14:39:16 +01:00
mark_story
410981296c
Fix ServerShell not being able to handle plugin assets.
...
Fixes #3575
2013-01-28 22:21:58 -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
AD7six
51946ff8fd
Remove Security.level from core.php
...
it's not used by cake, and it can confuse users familiar with 1.3
that this setting exists yet doesn't do anything in later versions
2013-01-22 09:56:01 +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
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
mark_story
f963e378b5
Fix coding standards errors.
2012-07-26 21:22:50 -04:00
José Lorenzo Rodríguez
255705a81e
Merge pull request #714 from shin1x1/pr_server_shell_2.3
...
Added ServerShell for PHP Built-in Server into 2.3 branch.
2012-07-25 14:10:28 -07:00
euromark
2a553dcfd1
unified doctype for browser related layout templates
2012-07-24 18:06:39 +02:00
mark_story
35bf3097cd
Fixing missing imports in generated tests.
...
Fixes #3059
2012-07-23 21:25:55 -04:00
euromark
4fe1ab1bf6
missing app uses statements
2012-07-21 13:34:33 +02: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
euromark
e1357ca8aa
indentation in templates
2012-07-18 03:24:55 +02:00
mark_story
2f7f5e1322
Use file cache as the default cache engine.
...
Too many people had issues using APC by default as its often configured
in strange ways, and works poorly on inexpensive hosting.
Fixes #2995
2012-07-15 09:11:27 -04:00
shin1x1
32d5f113d3
fixed phpcs errors.
2012-07-14 16:47:33 +09:00
shin1x1
dd524c96e1
Added ServerShell for PHP Built-in Server.
2012-07-13 02:29:42 +09:00
mark_story
b7415525c8
Fix missing line breaks.
...
Fixes #3028
2012-07-11 15:51:07 -04:00
Jose Lorenzo Rodriguez
ed4493da0c
Automatic console logging streams were not respecting --quiet
2012-07-06 16:05:15 -04:30
mark_story
eb4056625d
Re-add the sort option
...
Even though it does nothing, it should stick around as providing
it causes the shell to fail.
2012-06-22 20:53:53 -04:00
dogmatic69
058f48fc7b
Showing the list of shells grouped by plugin
...
The option to sort has been removed and the list of shells is now
sorted and grouped by plugin and then by command.
Core and app shells are always listed last.
2012-06-22 20:53:44 -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
AD7six
ad7b5bfb88
fix whitespace
...
tabs for indentation
spaces for alignment
2012-06-06 14:32:43 +02:00
Jelle Henkens
0e34bd4b1d
Suggest current path in bake project if dir is empty
2012-06-03 14:01:03 +01:00
mark_story
8da42dfcfa
Merge branch '2.1' into 2.2
2012-06-02 20:57:05 -04:00
mark_story
157e243eee
Change named capture group syntax.
...
This increases compatibility with really old version of
PCRE used on CentOS.
Refs #GH-681
2012-06-02 10:09:58 -04:00
Rachman Chavik
3f6593311b
logging: console support/format for new log types
2012-05-25 23:52:33 +07: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
ad31caeb0e
Merge branch '2.1' into 2.2
2012-05-20 14:53:41 -04:00
mark_story
7107cd6631
Fix fatal error when checking for PHPUnit.
...
Doubly including PHPUnit/Autoload.php causes fatal errors.
Having access to one of the PHPUnit classes means phpunit exists as
well.
Fixes #2890
2012-05-19 11:35:55 -04:00
Jelle Henkens
97ebbc8e23
Fixing coding conventions
2012-05-19 16:08:40 +01:00
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