Marc Würth
fcb7f86b76
include calls without parentheses
...
Refs https://github.com/cakephp/cakephp/pull/1698/files#r6748085
2013-10-16 01:40:45 +02:00
Jose Lorenzo Rodriguez
df549898ad
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
2013-10-12 01:05:02 +02:00
Mark Story
3c6d0af01d
Merge pull request #1644 from WyriHaximus/2.5
...
Add CompletionShell to allow easier development of shell scripts to provide autocompletion in environments like bash.
2013-10-11 13:17:05 -07:00
Mark Story
04eae1fc24
Merge pull request #1715 from bcrowe/hotfix-docblocks
...
Additional Cake references to CakePHP and docblock typo.
2013-10-10 09:54:14 -07:00
Rick Guyer
a091c630d7
Prevent name param from overwriting file if both are passed
2013-10-09 23:20:25 -05:00
Bryan Crowe
46c21a9a20
Revert Cake to CakePHP in ShellDispatcher::_initEnvironment()
2013-10-09 23:41:15 -04:00
Bryan Crowe
4242bd4f3d
Additional Cake references to CakePHP and docblock typo
2013-10-09 19:38:16 -04:00
Bryan Crowe
c1dd0e4393
Changed url to URL where appropriate
2013-10-07 23:17:58 -04:00
mark_story
60b0893c79
Merge branch 'master' into 2.5
2013-10-06 23:49:32 -03:00
wyrihaximus
ac9b7f3882
Refactored the shell reflection portion into a seperate task.
2013-10-02 22:30:12 +02:00
Cees-Jan
5c523a0cd5
Updated the shell given @renansaddam pointers
2013-10-02 22:02:40 +02:00
Cees-Jan
79202ad8a0
Updated doc blocks
2013-10-02 22:02:40 +02:00
Cees-Jan
cdf2b8c40d
Base completion files from @AD7six/cakephp-completion adjusted to be part of the framework
2013-10-02 22:02:40 +02:00
euromark
1c6a379346
Fix issue 4116 and also merge both versions of home.ctp
2013-09-30 20:45:26 +02:00
mark_story
5e9b22271a
Merge branch 'master' into 2.5
2013-09-27 22:26:33 -04:00
Bryan Crowe
bb65765d70
Updated additional references of Cake to CakePHP
2013-09-27 21:31:35 -04:00
euromark
c23531e806
Assert own tasks are loaded before trying to access taskNames.
2013-09-27 12:53:18 +02:00
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