euromark
4518624187
more whitespace coding standard corrections
2013-06-09 17:39:48 +02: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
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
mark_story
cdede82b7e
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Core/Object.php
2013-05-07 22:22:48 -04:00
ADmad
43b77bc0b5
Move App::uses() calls above the class.
...
Improve docblock for Object::log().
2013-05-07 03:30:19 +05:30
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
euromark
09d9efe235
spelling corrections (a url to an URL, unify URL)
2013-04-29 11:05:17 +02:00
mark_story
3fc627c5f8
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Error/ErrorHandler.php
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
lib/Cake/View/Helper/HtmlHelper.php
2013-03-30 22:12:27 -04:00
euromark
2df65fe9da
Add missing App::uses() to avoid fatal error
2013-03-27 17:03:24 +01:00
mark_story
041c2d289f
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Shell.php
2013-03-26 20:31:54 -04:00
mark_story
819029e1f3
Only load the object cache when requested.
...
Instead of loading a cache key that may not exist on every request, it
should only be loaded when required.
Fixes #3717
2013-03-20 21:26:42 -04:00
mark_story
4b13e0a5f2
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-03-04 21:55:29 -05:00
Phally
83f6161d1d
Fixes API parse error for link to Configure::read() in the book.
2013-03-03 20:10:09 +01:00
Jad Bitar
8eb5ce410a
Add scopes to Object::log()
signature.
2013-03-01 22:25:10 -05:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01: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
ADmad
970fdca89d
Added feature to ignore include errors for CakePlugin
2013-01-09 01:08:42 +05:30
Ceeram
3f4d24bfc0
remove unused local variables and a few improvements
2012-12-23 13:53:13 +01:00
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
ADmad
2bc5988674
Added ConfigReaderInterface::dump() and made all readers' dump() method support 'Plugin.keyname' format for keys. Closes #3363
2012-12-01 00:09:43 +05:30
mark_story
60f9626838
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-02 16:52:51 -04:00
mark_story
9ce70044b0
Fix missing query arguments in array urls.
...
Adding documented features that previously wasn't implemented.
Fixes #3328
2012-11-02 16:46:36 -04: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
AD7six
35686c9293
use the right language domain
...
these messages are for developers, not end users
2012-10-22 10:55:40 +02: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
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
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
Mark Story
89c98233b5
Merge pull request #843 from dereuromark/2.3-ticket-3172
...
check() for CookieComponent and Configure
2012-09-14 18:22:34 -07:00
euromark
6d3e0a25b2
save some memory usage (PHP < 5.4) in case of huge content and cut off the isset call
2012-09-15 02:33:05 +02:00
dogmatic69
cf8fccae96
converting $foo == null / $foo == false to !$foo
2012-09-14 18:26:30 +01:00
Kyle Robinson Young
bc40ac7d3f
Remove unused variables and code
2012-09-05 17:19:13 -07: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
euromark
2170d87488
check() for CookieComponent and Configure (similar to CakeSession::check()
)
2012-09-04 01:04:48 +02:00
mark_story
4487673060
Merge branch 'master' into 2.3
2012-08-09 20:43:47 -04:00
euromark
3945c0e6a8
rtim files
2012-07-18 03:55:29 +02:00
Ceeram
18b860ed1a
keeping methods BC, load() now returns false again when configname not default and not configured
2012-07-03 12:43:33 +02:00
Ceeram
19ba09286d
Make load() and dump() more consistent with each other, create new PhpReader for default if not configured yet.
...
Fixes #2998
2012-07-03 12:20:00 +02:00
mark_story
35e0984bec
Fix fatal error when E_STRICT is enabled.
...
If you have E_STRICT enabled and have a strict error in your files, you
would see a fatal error related to Debugger missing. PHP won't autoload
classes if you are currently in an autoload call, and an error is
triggered. Preloading Debugger + String in dev mode lets you see the
correct error.
2012-06-24 12:03:31 -04:00
AD7six
43b37cd608
Revert "actually, just ensure the path is slash terminated"
...
This reverts commit e88a2bcdbb
.
2012-06-07 23:32:43 +02:00
AD7six
e88a2bcdbb
actually, just ensure the path is slash terminated
...
that way we're all good
2012-06-07 23:29:49 +02:00
AD7six
5bcb1346ab
allow loading namespaced classes
...
This permits, e.g.
App::uses('Ns\Foo', 'Plugin.Lib');
...
new Ns\Foo();
new \Ns\Foo(); // Or
to work
2012-05-27 19:59:07 +02:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
Rachman Chavik
e6860fb856
changing LOG_ERROR to LOG_ERR in core files
2012-05-13 18:51:57 +07:00
mark_story
d43e0aa0db
Update dump() to allow partial dumps.
2012-05-01 21:00:42 -04:00
mark_story
6ba923d20f
Make the configure adapters responsible for persistence.
...
Each adapter should be handling persistence. This allows
different adapters to handle saving config files in different ways
or places.
2012-05-01 21:00:41 -04:00
mark_story
9f37277dab
Add Configure::dump().
2012-05-01 21:00:41 -04:00
AD7six
6b6fdd2b84
don't dump fatal errors as html on the cli
2012-04-29 16:25:07 +02:00
mark_story
f990ecfff3
Add Configure::clear()
...
Refs #2767
2012-04-14 23:32:29 -04:00
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
a56f7b84e3
Setting the core fatal error handler if it is not configured.
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
Juan Basso
440f0c38eb
Added a handler for fatal errors, showing internal server error page when debug is disabled or a custom fatal error page when enabled.
2012-04-14 16:08:35 -04:00
mark_story
e3b124516f
Move where set is loaded.
...
2.1 expects that Configure will load Set.
2012-04-10 21:25:04 -04:00
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
mark_story
29048b3bb7
Update to use Hash.
...
Update CakeSession & Configure to use Hash.
2012-03-26 22:25:41 -04:00
mark_story
fca8b1dd30
Fix issue where requestAction() would not strip base url.
...
requestAction + Controller::referer() don't work well together.
Stripping the base domain, and normalizing the URL gives an application
request which works much better. This keeps RequestHandler more
transparent when overloading redirects.
Fixes #2711
2012-03-24 18:11:07 -04:00
mark_story
8fdd57568b
Make method protected.
...
API changes should be minimized in bug fix releases.
Fix broken builds.
2012-03-16 21:46:07 -04:00
mark_story
111db16ca6
Restore error handlers.
...
When switching error handlers, remember to pop off the stack.
2012-03-16 20:56:24 -04:00
Thomas Ploch
cadfe15549
Fixed problems with custom Error handlers when inclusion of APP bootstrap is defered.
2012-03-15 16:06:54 +01:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
mark_story
4b3d8612e9
Fix typo causing notice errors.
...
Fixes #2658
2012-03-11 08:17:01 -04:00
mark_story
72d0105e20
Add plugin. prefix for plugin files.
...
This prevents app/plugin bleedthrough. This is
particularly problematic in controllers, as plugin
controllers were partially accessible from non-plugin
routes.
Fixes #2658
2012-03-10 23:33:21 -05:00
Mark Story
f26d24b445
Merge pull request #552 from tPl0ch/2.1-error-handler-bootstrap
...
Move inclusion of APP bootstrap after initialization of ErrorHandler
2012-03-10 17:59:03 -08:00
ADmad
13b748ad86
Fixed bug where registering new packages would reset extra paths set for other packages. Closes #2666
2012-03-10 04:40:50 +05:30
Thomas Ploch
7a93276ecf
Move inclusion of application bootstrap behind ErrorHandler initialization in Configure::bootstrap().
2012-03-08 16:00:13 +01:00
mark_story
63c992a85b
Fix coding standards in Core/
2012-03-03 19:37:46 -05:00
euromark
e94d307ee1
code conventions
2012-02-25 19:46:05 -05:00
Jose Lorenzo Rodriguez
cec9d2e615
Revert "Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit."
...
This reverts commit 5c792aa831
.
2012-02-20 15:21:03 -04:30
ADmad
5c792aa831
Adding bake skeleton's view directory to view paths list to avoid promlems with existing installation due to file moving done in earlier commit.
2012-02-16 18:15:12 +05:30
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
mark_story
f799d1c056
Add absolute path to cake/vendors.
...
When the app + cake are on different paths, `VENDORS` is incorrect, and
the built-in repo/vendors directory is not reachable by the default
paths.
Fixes #2545
2012-02-05 13:07:01 -05:00
mark_story
6c7a14e482
Adding fallback path to plugin.
...
This matches the recent changes for the app dir.
Adding tests for the plugin variant.
2012-01-30 22:21:00 -05:00
Matthew Lanigan
8ed4876830
Add APP/Package to tested paths in App::load()
2012-01-30 10:31:35 -05:00
mark_story
e770c7a72d
Split the AclComponent classes up.
...
Refs #2514
2012-01-29 13:54:26 -05:00
mark_story
1600322a54
Splitting ConfigReaderInterface out into a separate file.
...
Refs #2514
2012-01-29 13:30:05 -05:00
Jose Lorenzo Rodriguez
81b41aa561
Optimizing Configure::delete(), you can now delete arbitrarily nested keys
2012-01-14 23:30:31 -04:30
Jose Lorenzo Rodriguez
eab2d8aa66
Optimizing Configure::read(), now it is possible to read arbitrarily nested keys
2012-01-14 23:22:08 -04:30
Jose Lorenzo Rodriguez
3a48f64370
Optimizing and simplifying Configure::write(), this also allows arbitrary nesting limit in configure keys
2012-01-14 02:15:31 -04:30
mark_story
0e56d742b8
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Model/BehaviorCollection.php
lib/Cake/basics.php
2012-01-08 21:59:18 -05:00
mark_story
87924414fc
Update Configure::load() to use Set::merge()
...
This fixes some of the awkward behavior that using
array_merge_recursive() could create.
Fixes #2441
2012-01-07 10:45:48 -05:00
Jose Lorenzo Rodriguez
7c0297a92c
Merge branch '2.1' of github.com:cakephp/cakephp into 2.1
2012-01-05 19:58:15 -04:30
Jose Lorenzo Rodriguez
00a0c60733
Removing 1.3 Backwards compatible code to load underscored files. Now you can App::build('Locale') instead of 'locales'
2012-01-05 19:56:01 -04:30
mark_story
83987bee17
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Network/CakeRequest.php
2012-01-01 21:15:27 -05:00
Kyle Robinson Young
8b9770d34d
Fix types in docblocks in App class
2011-12-31 14:51:24 -08: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
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08: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
Kyle Robinson Young
c836ba08a3
Add/move docblocks to make text available in the API docs
2011-12-08 07:35:02 -08:00
mark_story
e7a7e57ba6
Fix bare require() to use App::uses()
...
Fixes #2346
2011-12-06 20:09:05 -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
Kyle Robinson Young
8197f87dbc
Spelling and grammar fixes
2011-12-01 21:58:09 -08:00
ADmad
73674c648c
Moving AppShell inside Console/Command for consistency with file location of other App classes. Also making all core shells and tasks extends AppShell instead of Shell. Closes #2278
2011-11-26 02:48:49 +05:30
mark_story
fb7d931bef
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
2011-11-15 23:10:34 -05:00
mark_story
ccefe02de9
Fix issue with duplicate class inclusions.
...
When trying to load a class that shared a prefix with an existing
class on case insensitive file systems duplicate class errors could
occur. This would happen primarily with models and missing model classes.
Fixes #2223
2011-11-13 16:15:32 -05:00
Kyle Robinson Young
dba4d21492
Add @link to App docblocks and missing _packageFormat docblock
2011-11-13 10:18:42 -08:00