Commit graph

197 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
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
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
6aca8036f4 baked tests match code standard by default 2012-05-10 23:51:22 +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
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
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
mark_story
b6de177ffa Merge branch '2.1' into 2.2 2012-04-23 21:50:36 -04: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
Jose Lorenzo Rodriguez
5a41024cf3 Removing hardcoded helper from PagesController in skel 2012-03-27 23:53:22 -04:30
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
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
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
Rachman Chavik
b545d8b201 fix getSchemaName() for Sqlserver.
Closes #2609.
2012-02-23 08:25:07 +07:00
Kyle Robinson Young
22582aee63 Upgrade legacy uses of App::build() types 2012-02-18 04:31:29 -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
ADmad
c7cfd45884 Syncing bake skeleton with app 2012-02-16 01:58:11 +05:30
Majna
b61f46b030 Add Console/Templates and webroot/files to bake skel. Update tests. 2012-02-07 18:51:04 +01: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
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
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
8608caa8a2 Merge pull request #298 from vitorpc/2.0
Property 'name' removed of PagesController.
2012-01-17 18:52:26 -08: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
Ceeram
9f40e6de79 move AppShell to app/Console/Command directory 2012-01-12 11:55:10 +01:00
mark_story
0b0a69de1e Update default layouts to use blocks. 2011-12-17 22:23:37 -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
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08: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
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
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
Rachman Chavik
fa80be50eb Removing timestamp lines from generated files
This causes unnecessary diff chunks, and we should depend more on
the SCM instead of these values.
2011-11-25 08:45:33 +07:00
ADmad
233a63366f Syncing files between app directory and bake skeleton 2011-11-14 02:32:59 +05:30
Renan Gonçalves aka renan.saddam
2a33bc862a Merge pull request #296 from majna/2.0-dbconfig-task
Fix for 'datasource' key when baking another db config.
2011-11-07 01:58:54 -08:00
Kyle Robinson Young
b2414a777f Remove 5.3 notice from lib/Cake/Console/Templates/skel/Config/core timezone comment 2011-11-06 13:17:07 -08:00
Vitor Pacheco
2b5b7694c9 Property 'name' removed of PagesController. 2011-11-05 15:25:41 -02:00
Majna
1b9b90d2e7 Replacing 'driver' with 'datasource'. 2011-11-04 23:07:31 +01:00
Marko Marković
385f6f164f Fixed typos in css 2011-11-01 16:59:11 +01:00
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04:00
mark_story
8529d76e6f Removing Xml prolog from default xml layouts.
Both DOMDocument and SimpleXML output the prolog when
saving xml.

Fixes #2171
2011-10-27 20:58:03 -04:00
m
5a5a542a71 Missing ini_set of include path for test.php
Fixes #2167

Signed-off-by: mark_story <mark@mark-story.com>
2011-10-25 22:26:59 -04:00
mark_story
d92c73d821 Remove reference to XmlHelper.
Refs #2164
2011-10-25 20:16:58 -04:00
Majna
a9dbde0cbd Fixing incorrect doc blocks regarding error handler. 2011-10-23 21:55:20 +02:00
Rachman Chavik
a60d71d19b removing 'empty' files from nonempty directories 2011-10-19 12:19:28 +07:00
Rachman Chavik
2bb93761cc fixing typos 2011-10-19 12:19:28 +07:00
mark_story
d7155d374b Making apc feature test rely on apc_dec.
ZCS comes with a busted apc, and we need apc_dec to properly
use the ApcEngine anyways.

Fixes #2105
2011-10-18 20:48:58 -04:00
Jose Lorenzo Rodriguez
e47b970811 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-10-16 15:45:47 -04:30
Jose Lorenzo Rodriguez
b38c0e50a4 Adding configuration options to CakeEmail to set the header encoding and body encoding, also translating
all string from the App.encoding value to the configured charset if they differ. This makes possible to
send correctly emails in japanese charset
2011-10-16 15:43:10 -04:30
Renan Gonçalves
d2a664c2df Fixing @package at in Cake/Console/Templates/skel files. 2011-10-15 20:30:49 +02:00
Renan Gonçalves
507eb2f653 Fixing @package at in Cake/Console/Templates files. 2011-10-15 20:26:48 +02:00
Jose Lorenzo Rodriguez
f8772dc524 Also changing shell script in skel directory 2011-10-15 10:18:36 -04:30
Jose Lorenzo Rodriguez
36fa2e87b4 Adding symlink support to the cake console executable 2011-10-14 22:15:26 -04:30
mark_story
6bf6d79979 Removing 'cake' domain from core.
This domain was supposed to be replaced by cake_dev.
There are a number of translations that should be App land as well.
Such as those in helpers.

Fixes #2103
2011-10-14 21:01:17 -04:00
Heath Nail
9e9b1f0382 Windows newlines for .bat files. 2011-10-14 15:31:09 -04:00
Heath Nail
36162621cf Incresing sync between app and skel directories. 2011-10-14 15:28:38 -04:00
Heath Nail
ce4acda25b Incresing sync between app and skel directories. 2011-10-14 15:06:36 -04:00
evilbloodydemon
8e78308261 Removed unnecessary ClassRegistry::flush() from test template. 2011-10-12 13:37:50 +04:00
Majna
a5220fa7bb Fixed doc block comments. 2011-10-11 00:22:23 +02:00
mark_story
3f778d8936 Fix inconsistency between app and skel directory.
Fixes #2077
2011-10-08 14:40:11 -04:00