adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-26 08:47:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
19634 commits 7 branches 0 tags 44 MiB
Commit graph

430 commits

Author SHA1 Message Date
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
4487673060 Merge branch 'master' into 2.3 2012-08-09 20:43:47 -04:00
mark_story
73b1c0ac1c Fix off by one error. 
Fixes #3094
 2012-08-03 23:34:44 -04:00
mark_story
d94cdc67fe Merge branch 'master' into 2.3 2012-07-27 22:38:24 -04:00
mark_story
35bf3097cd Fixing missing imports in generated tests. 
Fixes #3059
 2012-07-23 21:25:55 -04: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
mark_story
b7415525c8 Fix missing line breaks. 
Fixes #3028
 2012-07-11 15:51:07 -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
Jelle Henkens
0e34bd4b1d Suggest current path in bake project if dir is empty 2012-06-03 14:01:03 +01: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
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
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
AD7six
6933b31be5 include plugin name in model tests 2012-05-11 00:33:10 +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
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
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
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
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
euromark
6353558622 bame themes now in correct order: app -> plugin -> default 2012-04-24 02:40:42 +02:00
Rachman Chavik
36275129d7 i18n: consider real path of APP to handle symlinks 
When extracting model validation messages, Reflection::getFileName is used
to obtain the the model filename. The returned value is actual physical
path and may differ to what APP is. Adding the realpath(APP) to $paths
variable allows str_replace() to correctly generate the correct value for
$occurences.
 2012-04-24 07:29:26 +07:00
mark_story
9f9feec222 Merge branch '2.2-hash' into 2.2 
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/View/Helper/FormHelper.php
 2012-04-10 21:32:37 -04:00
mark_story
ee7a224639 Fix a code style warning. 2012-03-31 21:40:20 -04:00
Kyle Robinson Young
e2a46f76c7 substr() optimizations 2012-03-28 13:07:26 -07:00
mark_story
19e0d8d946 Switch usage to Hash where possible. 2012-03-26 22:32:53 -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
7d51db9e63 Merge branch '2.0' into 2.1 2012-03-03 12:27:22 -05:00
Rob McVey
8e93c4cd34 Fix for Consolce/Task/TestTask::getRealClassName(). Controller names of exactly 10 letters 
being returned incorrectly

Signed-off-by: mark_story <mark@mark-story.com>
 2012-02-28 15:21:59 -05:00
euromark
22452f61f8 type hinting controllers and views 2012-02-25 19:46:06 -05:00
euromark
e94d307ee1 code conventions 2012-02-25 19:46:05 -05:00
Kyle Robinson Young
45ec5d73c5 Add missing visibility keywords 2012-02-16 23:13:12 -08:00
Majna
1dbafe1d4f Fix docblocks. 2012-02-17 13:51:20 +01:00
AD7six
369d316835 Restructure internals of Extract task 
Use variables which are easily identifiable and an internal storage
structure which prevents duplicates.
 2012-02-14 15:30:09 +01:00
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
Majna
454f383951 Fix console option parser for --empty in ProjectTask. 
Command 'cake bake project --empty myapp' ignores argument myapp.
 2012-02-07 18:35:12 +01:00
mark_story
4949a87b7e Fix issues with duplicate msgid values. 
Msgid values could be duplicated if the same string was used
for singular and pluralized translations.  Re-index how the data is
stored so duplicate singular detection per domain is easier.

Fixes #2538
 2012-02-06 21:25:11 -05:00
Vinícius Krolow
fa5f175244 Improve the extract to know when there is the same string inside one plural 
Fixes #2538
 2012-02-06 20:10:33 -05:00
mark_story
f3b990bf0f Correct path display for plugins. 
Fixes #2548
 2012-02-05 12:00:55 -05:00
mark_story
752711e963 Fix missing behavior constructor. 2012-01-27 21:10:57 -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
mark_story
70bb839de9 Add validation guess for not null + text types. 
Fixes #2493
 2012-01-21 13:10:30 -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
e080bb27b9 Merge pull request #411 from fitorec/2.0 
Check the logic in the Shell::in($prompt, $options = null, $default = null)
 2012-01-17 18:53:00 -08:00
Fitorec
ddbaa66997 Reviewing the logic in the Shell::in($prompt, $options = null, $default = null) 2012-01-15 21:16:45 -06: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
07a2a60468 Merge branch '2.0' into 2.1 2011-12-13 22:03:40 -05:00
mark_story
dd335cb183 Fix error in FixtureTask 
The options are always set, use empty() instead.

Fixes #2373
 2011-12-13 20:40:30 -05: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
Ceeram
e4e26a852b Making non-interactive behave same as interactive with odd table names 2011-12-05 17:00:48 +01: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
Mark Story
d4fd1b3743 Merge pull request #348 from petteyg/apptheme 
Make TemplateTask prioritize App templates over Core templates
 2011-12-02 17:28:01 -08:00
Kyle Robinson Young
8197f87dbc Spelling and grammar fixes 2011-12-01 21:58:09 -08:00
Gordon Pettey (petteyg)
a800dcbbca Merge branch 'master' into apptheme 2011-12-02 02:29:43 +00:00
Ceeram
faddfbe2d0 Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-12-01 20:30:45 +01:00
Ceeram
0a1772c929 adding default name, for dbs that dont expose a PK 2011-12-01 20:30:36 +01:00
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
Kyle Robinson Young
5876744709 Adhering to coding standards 2011-11-30 07:44:11 -08:00
Ceeram
57a1a2814d Fixing modeltask to use correct table 
ModelTask will now bake correct primaryKey when not id
 2011-11-29 00:00:00 +01: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
Rachman Chavik
204851842b In a multidb habtm, we cannot rely on 'joinTable' 
Instead, we should use value from 'with' when it's available.
 2011-11-25 22:29:23 +07:00
mark_story
4103fe14a2 Fix double / issue in ExtractTask 
Also fix an issue where extracting pot files for plugins ended up creating
a Localedefault.pot file incorrectly.

Fixes #2284
 2011-11-23 21:03:24 -05:00
mark_story
6d6ac10834 Fix failing tests caused by previous commit. 2011-11-20 23:00:58 -05:00
AD7six
adf73abb07 another bulletproofing for schemaless baking 2011-11-20 16:08:01 +01:00
AD7six
43ae7af17d prevent missing-index notices 
when baking with a schemaless db
 2011-11-20 15:44:44 +01:00
AD7six
f0fa6c7875 code standards 2011-11-20 01:17:07 +01:00
AD7six
8e38f666b7 allow baking models with missing tables - even for rdbms 
test updated to reflect expected new expected behavior. If you bake a
model with the table missing, if forced to run skip any part of the
process that would result in an exception.
 2011-11-20 01:11:33 +01:00
AD7six
ac8e1e8304 allow creating models without the table existing 
particularly useful/appropriate for schemaless datasources
 2011-11-19 23:51:39 +01:00
Gordon Pettey (petteyg)
99e6072fd3 Make App::path('Console') overwrite App::core('Console') for themes 2011-11-18 05:00:45 +00:00
mark_story
8981f49bd5 Add stricter validation to TestTask. 
Empty classnames, and classnames without the correct type suffix
are no longer accepted.  They did the wrong thing anyways.

Fixes #2267
 2011-11-16 20:38:31 -05:00
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
Majna
57afa1873e Make View task use prefixed template before falling back to generic one. It is possible now to create view templates for different prefixes. 2011-11-07 01:01:56 +01:00
Mark Story
db41a7dd16 Merge pull request #302 from majna/2.0-viewtask-methods 
Fix View task generating only 'admin' methods views in non-interactive mode.
 2011-11-06 12:59:38 -08:00
mark_story
aae8a89623 Change var -> public in controllertask. 
Makes the confirmation message and generated code the same.
Fixes #2216
 2011-11-06 11:50:16 -05:00
mark_story
cfe38985cf Fix failing tests caused by changes in App::objects() 2011-11-06 11:23:11 -05:00
Majna
d84b66e744 Fix View task generating only 'admin' methods views in non-interactive mode. 2011-11-06 16:14:55 +01:00
Majna
3374406bbf Fix View task missing 'app' param when baking custom action. 2011-11-05 19:54:21 +01:00
Majna
1b9b90d2e7 Replacing 'driver' with 'datasource'. 2011-11-04 23:07:31 +01:00
Majna
1455c59e0c Fix notice when baking db config: Undefined variable 'driver'. 2011-11-04 22:49:38 +01:00
Majna
51ccbad170 Fixing ignored '--exclude-plugins' option on Windows for Extract task. 2011-11-03 21:34:32 +01:00
Jose Lorenzo Rodriguez
d49096aab9 Fixing DbConfigTask to produce correct configurations 2011-10-30 18:25:43 -04:30
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04:00
James Larking
75daff8df9 Camelize type of test being generated. 
This fixes use for:

`cake bake model ModelName`

When classTypes and directories should be CamelCase.
This solves issue whereby model tests are written directly to Cases folder rather than into Cases/Model

Signed-off-by: mark_story <mark@mark-story.com>
 2011-10-23 11:13:56 -04:00
mark_story
72006b9369 Fix options in OptionParser for TestTask 
Fix the allowed options for type to allow Camelcase versions as well.
 2011-10-23 11:10:52 -04:00
mark_story
7f3c5662ba Fix issue where plugin prefixes would be included in generated view. 
Fix issue with `cake bake view Plugin.Model` style view creation.
Fixes #2095
 2011-10-12 21:09:19 -04:00
mark_story
f65d763551 Removing ?> from AppModel and AppController plugin templates. 2011-10-12 20:42:23 -04:00
mark_story
e56a2cdb2b Set debug=2 when bake is run. 
This should help with model caches being re-used when they shouldn't.
Fixes #2063
 2011-10-04 22:25:18 -04:00
mark_story
cb1ce83a54 Removing duplicate inflection. 
Fixes #2058
 2011-10-04 20:10:25 -04:00
Jose Lorenzo Rodriguez
4110ab7952 Fixing error introduced in my last commit 2011-10-03 12:08:08 -04:30
Jose Lorenzo Rodriguez
d08f916179 Grabbing the first available config defined in connection manager as a default for baking. Fixing a couple of failing test cases 2011-10-03 11:54:40 -04:30
mark_story
84f805419d Fixing issue where DbConfigTask would try to rebuild 
database configuration.

This could happen when using commands like `Console/cake bake controller`.
Using ConnectionManager ensures that the database config file will be loaded
if its available.
 2011-10-02 22:53:45 -04:00
mark_story
aae2b0c257 Fixing issue baking controller tests. 
During interactive controller baking, controller tests
would be generated with the wrong filename.
During interactive baking fixtures would not be detected.
Fixes #2052
 2011-10-02 22:53:37 -04:00
mark_story
c9bd97309f Merge branch '1.3' into merger 
Conflicts:
	cake/libs/configure.php
	cake/libs/controller/components/email.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Utility/InflectorTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
 2011-10-01 22:38:20 -04:00
Jose Lorenzo Rodriguez
fff42e92ed Adding a few class loading related changes to make the ApiGenerator plugin happy 2011-09-30 01:55:33 -04:30
Gordon Pettey (petteyg)
744558de90 Add validation guess for Postgress inet field 2011-09-20 17:45:35 +00:00
ADmad
97a975c6c4 Refactoring Model::invalidFields() a bit. 2011-09-12 05:10:34 +05:30
mark_story
3cb3424b4f Add App::uses to baked controllers. 
Controllers should load their dependencies.
Bake should help with the best practice.
Fixes #1971
 2011-09-09 20:43:04 -04:00
mark_story
7c08c966b0 Adding App::uses() call to model baking. 
Models should always include their parent classes to be safe.
Bake should reflect the best practice.
Refs #1971
 2011-09-09 20:43:04 -04:00
Jose Lorenzo Rodriguez
89b1e54071 Removing Oracle driver, it will not make it to stable release. Revert this commit to bring it back for next version 2011-09-03 06:50:19 -04:30
mark_story
efbeab6199 Merge branch '1.3' into merger 
Conflicts:
	cake/libs/controller/components/email.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	lib/Cake/Console/Command/Task/DbConfigTask.php
 2011-09-03 00:48:09 +01:00
Mark Story
59c6b419e5 Merge branch '1.3' into merger 
Conflicts:
	cake/console/libs/bake.php
	cake/libs/configure.php
	cake/libs/controller/components/request_handler.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Test/Case/Controller/ScaffoldTest.php
	lib/Cake/Utility/Validation.php
 2011-08-28 22:08:49 -04:00
Juan Basso
f5a54d00dd Changed methods and attributes from private to protected. 2011-08-20 00:43:34 -04:00
Juan Basso
40654df5ab Fixing more documentations. 2011-08-18 22:31:00 -04:00
Juan Basso
16ef234180 Removing trailing spaces. 2011-08-15 23:55:08 -04:00
Juan Basso
620a65b2fc Merge branch '2.0' into 2.0-api-doc 
Conflicts:
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Utility/Debugger.php
 2011-08-14 21:12:05 -04:00
mark_story
c1b0eb8f21 Updating output of project task to better reflect what 
happened.
 2011-08-03 21:56:24 -04:00
Mark Story
cdcabc79b6 Doing some refactoring in the project task. 
Adding tests for constants staying commented out when CakePHP is on the include_path.
 2011-08-03 20:06:47 -04:00
Mark Story
6e2870c706 Removing APP_PATH it is always the same as APP. 
Fixing a typo in index.php.
 2011-08-03 20:06:47 -04:00
Mark Story
20e9015f80 Making skel files generate hard coded paths, when CakePHP 
is not on the include_path, and exclude hard coded paths when it is.
 2011-08-03 20:06:47 -04:00
Juan Basso
895c10af7b Adjusted some types in @param, @return and @var. 2011-07-31 22:57:17 -04:00
ADmad
b15c77ecc3 Enhancing validation messages to have placeholders. Closes #1855 2011-07-31 06:33:56 +05:30
Juan Basso
9bc3e567c1 Removed the @access and @static. 2011-07-30 20:56:48 -04:00
Juan Basso
511b480285 Reverted the change from while to if. 2011-07-28 23:33:27 -04:00
Juan Basso
a0ee8b49fe Fixed some API doc in console. 2011-07-28 22:05:29 -04:00
Majna
29e4cad99e Fix for lowercased schema folder when baking plugin skel 2011-07-28 18:57:10 +02:00
Jose Lorenzo Rodriguez
cfd2d9e00b Updating all @package annotations in doc blocks 2011-07-26 01:46:14 -04:30
Mark Story
74e2cb1507 Updating doc blocks and @package strings for Console 
classes.
 2011-07-25 21:46:52 -04:00
Ceeram
a025cb2e01 Adding option to ProjectTask, for setting CAKE_CORE_INCLUDE_PATH. Tests added. 2011-07-13 23:54:24 +02:00
Ceeram
e3dfec98c7 fixing regex for setting constant in test.php 2011-07-13 18:23:07 +02:00
Jose Lorenzo Rodriguez
eaa80bbced Completing support for extracting model validation messages from application plugins 2011-07-07 02:11:48 -04:30
Jose Lorenzo Rodriguez
d2519ae0ae Adding support to the extract task to operate on a single plugin, thus removing the hassle of declaring the plugin path in command line 2011-07-07 01:57:55 -04:30
Jose Lorenzo Rodriguez
765164f33b Merge branch '2.0-extract-model-validation' into 2.0 2011-07-07 01:05:39 -04:30
Mark Story
91a1cf81f3 Merge branch '1.3' into merger 
Conflicts:
	app/Config/acl.ini.php
	app/config/database.php.default
	app/webroot/css.php
	app/webroot/css/cake.generic.css
	cake/basics.php
	cake/bootstrap.php
	cake/config/paths.php
	cake/console/cake.php
	cake/console/error.php
	cake/console/libs/acl.php
	cake/console/libs/bake.php
	cake/console/libs/i18n.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/plugin.php
	cake/console/libs/tasks/project.php
	cake/console/libs/testsuite.php
	cake/console/templates/default/classes/test.ctp
	cake/console/templates/default/views/home.ctp
	cake/console/templates/default/views/view.ctp
	cake/console/templates/skel/config/database.php.default
	cake/console/templates/skel/views/elements/email/text/default.ctp
	cake/console/templates/skel/webroot/css.php
	cake/dispatcher.php
	cake/libs/cache.php
	cake/libs/cake_session.php
	cake/libs/configure.php
	cake/libs/controller/component.php
	cake/libs/controller/components/auth.php
	cake/libs/controller/components/email.php
	cake/libs/controller/components/request_handler.php
	cake/libs/controller/components/security.php
	cake/libs/controller/controller.php
	cake/libs/controller/scaffold.php
	cake/libs/error.php
	cake/libs/magic_db.php
	cake/libs/model/behaviors/acl.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/router.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/errors/missing_behavior_class.ctp
	cake/libs/view/errors/missing_behavior_file.ctp
	cake/libs/view/errors/missing_component_class.ctp
	cake/libs/view/errors/missing_component_file.ctp
	cake/libs/view/errors/missing_connection.ctp
	cake/libs/view/errors/missing_controller.ctp
	cake/libs/view/errors/missing_helper_class.ctp
	cake/libs/view/errors/missing_helper_file.ctp
	cake/libs/view/errors/missing_layout.ctp
	cake/libs/view/errors/missing_model.ctp
	cake/libs/view/errors/missing_scaffolddb.ctp
	cake/libs/view/errors/missing_table.ctp
	cake/libs/view/errors/missing_view.ctp
	cake/libs/view/errors/private_action.ctp
	cake/libs/view/errors/scaffold_error.ctp
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/helpers/js.php
	cake/libs/view/helpers/session.php
	cake/libs/view/helpers/xml.php
	cake/libs/view/media.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/index.ctp
	cake/libs/view/scaffolds/view.ctp
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/console/cake.test.php
	cake/tests/cases/console/libs/acl.test.php
	cake/tests/cases/console/libs/api.test.php
	cake/tests/cases/console/libs/bake.test.php
	cake/tests/cases/console/libs/shell.test.php
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/console/libs/tasks/db_config.test.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/libs/tasks/model.test.php
	cake/tests/cases/console/libs/tasks/plugin.test.php
	cake/tests/cases/console/libs/tasks/project.test.php
	cake/tests/cases/console/libs/tasks/test.test.php
	cake/tests/cases/console/libs/tasks/view.test.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/cache/apc.test.php
	cake/tests/cases/libs/cake_session.test.php
	cake/tests/cases/libs/cake_test_case.test.php
	cake/tests/cases/libs/code_coverage_manager.test.php
	cake/tests/cases/libs/configure.test.php
	cake/tests/cases/libs/controller/component.test.php
	cake/tests/cases/libs/controller/components/auth.test.php
	cake/tests/cases/libs/controller/components/cookie.test.php
	cake/tests/cases/libs/controller/components/request_handler.test.php
	cake/tests/cases/libs/controller/components/session.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/controller/pages_controller.test.php
	cake/tests/cases/libs/error.test.php
	cake/tests/cases/libs/http_socket.test.php
	cake/tests/cases/libs/magic_db.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/cases/libs/model/models.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/test_manager.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/cases/libs/view/helpers/session.test.php
	cake/tests/cases/libs/view/helpers/xml.test.php
	cake/tests/cases/libs/view/media.test.php
	cake/tests/cases/libs/view/theme.test.php
	cake/tests/cases/libs/xml.test.php
	cake/tests/fixtures/aco_fixture.php
	cake/tests/fixtures/translate_fixture.php
	cake/tests/groups/acl.group.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/cache.group.php
	cake/tests/groups/components.group.php
	cake/tests/groups/configure.group.php
	cake/tests/groups/console.group.php
	cake/tests/groups/controller.group.php
	cake/tests/groups/database.group.php
	cake/tests/groups/helpers.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/groups/lib.group.php
	cake/tests/groups/model.group.php
	cake/tests/groups/no_cross_contamination.group.php
	cake/tests/groups/routing_system.group.php
	cake/tests/groups/socket.group.php
	cake/tests/groups/test_suite.group.php
	cake/tests/groups/view.group.php
	cake/tests/groups/xml.group.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/cake_test_model.php
	cake/tests/lib/cake_test_suite_dispatcher.php
	cake/tests/lib/cake_web_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/lib/reporter/cake_base_reporter.php
	cake/tests/lib/reporter/cake_cli_reporter.php
	cake/tests/lib/reporter/cake_text_reporter.php
	cake/tests/lib/templates/menu.php
	cake/tests/lib/templates/simpletest.php
	cake/tests/lib/test_manager.php
	cake/tests/test_app/controllers/tests_apps_controller.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/libs/library.php
	cake/tests/test_app/libs/log/test_app_log.php
	cake/tests/test_app/plugins/test_plugin/config/load.php
	cake/tests/test_app/plugins/test_plugin/config/more.load.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
	cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
	cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
	cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
	cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
	cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
	cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
	cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
	cake/tests/test_app/vendors/Test/MyTest.php
	cake/tests/test_app/vendors/Test/hello.php
	cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
	cake/tests/test_app/vendors/shells/sample.php
	cake/tests/test_app/vendors/somename/some.name.php
	cake/tests/test_app/vendors/welcome.php
	cake/tests/test_app/views/elements/email/text/default.ctp
	cake/tests/test_app/views/layouts/default.ctp
	cake/tests/test_app/views/posts/test_nocache_tags.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Console/cake.bat
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Test/Case/Log/Engine/FileLog.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/test_app/View/Emails/html/custom.ctp
	lib/Cake/Test/test_app/View/Emails/text/custom.ctp
	lib/Cake/TestSuite/templates/header.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
 2011-06-23 12:48:06 -07:00
Jose Lorenzo Rodriguez
d54f8dc07a Fixing some shell tests when that fail when they are run in window 2011-06-21 11:24:59 -04:30
Jose Lorenzo Rodriguez
41603cacb7 Fixing Fixture generation task to be more compatible with SqlSrv 2011-06-20 19:03:00 -04:30
Jose Lorenzo Rodriguez
33c74b6062 Implementing validation domain extraction in the ExtractionTask 2011-06-20 00:36:31 -04:30
Juan Basso
1c7d54eacc Updated the paths from comments. 2011-06-19 20:28:40 -04:00
Juan Basso
21348169fa Camelized templates folder. 2011-05-30 23:02:39 -04:00
Juan Basso
192812ee7f Updating the copyright to 2011. 2011-05-30 22:32:43 -04:00
Renan Gonçalves
ed96936ea7 According to CakePHP conding styles, methods prefixed by _ are protected. Changing where it makes sense and don't break anything. 2011-05-30 22:26:42 +02:00
Renan Gonçalves
438050dcaa Adding 'public' visibility to all public methods. 2011-05-30 22:02:32 +02:00
Renan Gonçalves
d0af5c78d5 Fixing the path used to create fixtures. 2011-05-30 21:04:38 +02:00
Renan Gonçalves
f55fa4d026 Removing the specific getPath() method, it was giving the same result as the parent one. 2011-05-30 20:52:58 +02:00
ADmad
c5a2efc5dd Merge pull request #103 from tPl0ch/2.0-bake-controller 
2.0 Shell - Wrong underscore naming of Shells and Tasks
 2011-05-29 04:56:40 -07:00
Thomas Ploch
a80d82e4a0 Fixed Shell naming from using Inflector::underscore() to Inflector::camelize(). Added small test case for Shell naming. Fixed missing CakePlugin::load() call in ShellTest. 2011-05-29 12:32:30 +02:00
Jose Lorenzo Rodriguez
93ac47fa60 Adding ability to ExtractTask to inspect models and extract the validation messages from them 2011-05-27 22:18:56 -04:30
Jose Lorenzo Rodriguez
991501d489 Implementing a new option 'exclude-plugins' from the ExtractTask 2011-05-27 15:55:50 -04:30
Ceeram
5f97292648 Change case of Controller::$plugin, fixing missing plugin exceptions, tests updated. Also removing no longer needed camelize() calls 2011-05-26 15:31:40 +02:00
Juan Basso
2ea5be5de2 Merge branch '2.0-mssql' into 2.0 2011-05-24 00:07:56 -04:00
Juan Basso
39320ef352 Renamed the Mssql driver to Sqlserver. 2011-05-22 23:19:13 -04:00
mark_story
87bccdafe6 Updating PluginTask to filter out paths that don't exist, and not offer 
them as options for baking plugins into.  Fixes #1723
 2011-05-22 22:04:08 -04:00
mark_story
85752e21c1 Removing undefined variable use. 
Making the plugin path match the old plugins directory.
 2011-05-22 22:04:08 -04:00
Ceeram
95a5b99b0e Merge branch '2.0' of github.com:cakephp/cakephp into 2.0 2011-05-22 23:36:48 +02:00
Ceeram
661a0cca23 removing DS, App::core('Console') already ends with DS 2011-05-22 23:29:17 +02:00
mark_story
1d687214e9 Fixing ViewTask so it creates properly cased directories for 2.0. 
Fixes #1725
 2011-05-22 14:42:43 -04:00
mark_story
4d76840d44 Fixing 'no' option when baking projects. Replying no, will enter 
iteractive mode now.  Fixes #1721
 2011-05-22 08:56:19 -04:00
mark_story
2b20eb8999 Fixing issues with ProjectTask and absolute paths. 
Fixes #1720
 2011-05-22 08:49:51 -04:00
Heath Nail
e645fa7340 Make baked plugin directories consistent with 2.0 conventions. 2011-05-19 13:06:12 -04:00
Heath Nail
930ef89f8c Pages directory should be capitalized. 2011-05-17 18:37:12 -04:00
Heath Nail
dc85d21f05 Dots appear in the text searched for, added to search pattern. 
The define statement in skel/webroot/index.php contains dots. Added \.
to the search pattern so that bake will update the core path in
webroot/index.php
 2011-05-17 14:34:10 -04:00
AD7six
a199e72610 the correct argument for plugins is infact "plugins" 2011-05-15 19:28:17 +02:00
AD7six
42c5c6e7fe when using App::path but expecting 1 result - use the first 2011-05-15 18:39:38 +02:00
AD7six
0cb70ae3bb remove CONFIGS constant 2011-05-15 18:34:52 +02:00
AD7six
afa8f6b441 remove LIBS constant 
libs always means the Cake lib - so use the CAKE constant
 2011-05-15 18:29:52 +02:00
AD7six
e313448998 remove VIEWS constant 2011-05-15 17:35:01 +02:00
AD7six
62d66bc3ad remove MODELS constant 2011-05-15 17:35:00 +02:00
AD7six
80e68763a3 remove CONTROLLERS constant 2011-05-15 17:35:00 +02:00
Jose Lorenzo Rodriguez
eea981940e Replacing config string in favor of Config 2011-05-13 03:36:45 -04:30
Jose Lorenzo Rodriguez
2a54f0923d More string replacing for new paths 2011-05-13 03:23:53 -04:30
Jose Lorenzo Rodriguez
2be486844e Fixing PluginTask tests 2011-05-11 23:48:51 -04:30
mark_story
317aad9526 Fixing missing uses for Controller Task. 
Fixing incorrect import() for ClassRegistry.
 2011-05-01 14:58:32 -04:00
Sonny Gauran
4add005baa Fixed baked database.php constants 2011-04-30 02:12:15 +08:00
Renan Gonçalves
170ba71850 Changing the visiblity from private to protected, for extensibility sake. 2011-04-25 22:08:12 +02:00
Renan Gonçalves
9da76a8655 Fixing a couple of typos from last commit. 2011-04-25 21:35:27 +02:00
Renan Gonçalves
abbe5aaea2 Updating console to use i18n'ed strings. 2011-04-25 21:24:16 +02:00
Renan Gonçalves
3251faf8e9 Expliciting methods visibility. 
No need to keep track of line anymore, token_get_all (PHP 5.2.2) returns it.
... and fixing some grammar typos on the way.
 2011-04-25 21:24:07 +02:00
Renan Gonçalves
cd3529c986 Implementing support to multiline string in __*() calls. 2011-04-25 21:23:56 +02:00
evilbloodydemon
cebcd64090 Unused variables in Console removed 2011-04-23 00:02:06 +04:00
Jose Lorenzo Rodriguez
b1e74cff5b Fixing more path generation for plugins, and typo from previous commit 2011-04-20 11:32:16 -04:30
Jose Lorenzo Rodriguez
254225372a Fixing problem with skel generation in project task 2011-04-19 12:14:02 -04:30
AD7six
9ac79da3f7 don't repeat the default value in the message 
the default value is the cli prompt anywaya
 2011-04-17 18:17:25 +02:00
AD7six
1c62a66b0b simpler bake prompt 
we don't need to repeat the defualt path twice, and a user can just as
easily type "appname" instead of /some/absolute/path/appname
 2011-04-17 18:12:25 +02:00
AD7six
4ab27d6fea full paths are /not/ needed. 
having the help/text state it is necessary is confusing
 2011-04-17 18:08:10 +02:00
AD7six
010feb2092 prevent surpirses with Folder not being available. 
Previously loading File would load Folder also - that's not true with
the new changes, ensure that the Folder class is regsitered with
App::users when the Folder class is used.
 2011-04-17 18:03:43 +02:00
AD7six
c1a8dbbce7 provide a default skel dir, and default to the core 2011-04-16 20:20:27 +02:00
AD7six
a0fce70c13 prevent undefined index error baking a new project 
if you call `cake bake project` the skel param is not present
 2011-04-16 19:22:53 +02:00
Jose Lorenzo Rodriguez
9f5ab79abc Fixing bake tasks after most recent changes 2011-04-11 23:01:48 -04:30
Jose Lorenzo Rodriguez
000e05b468 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/libs/view/helpers/js.php
	cake/tests/lib/templates/missing_conenction.php
	cake/tests/lib/templates/missing_connection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/templates/missing_conenction.php
	lib/Cake/View/Helper/FormHelper.php
	lib/Cake/tests/Case/Core/ConfigureTest.php
 2011-04-11 22:48:08 -04:30
Jose Lorenzo Rodriguez
1bbdefc4ad Fixing some bake tasks 2011-04-11 22:15:51 -04:30
Jose Lorenzo Rodriguez
241a3bf624 Fixing ProjectTask tests and renaming folders in skel directory 2011-04-11 21:43:40 -04:30
Jose Lorenzo Rodriguez
662abd6419 Refactoring FixtureTask so it generates correct file names 2011-04-10 20:56:06 -04:30
Jose Lorenzo Rodriguez
d561460fda Refactoring TestTask so it generates tests according to the new file naming standard 2011-04-10 20:49:16 -04:30
Jose Lorenzo Rodriguez
7f2734d053 Starting to migrate internal tests files to the new file schema, and fixing related tests 2011-04-10 15:02:19 -04:30
Jose Lorenzo Rodriguez
5c91827c44 Fixing typo in controller task 2011-03-21 00:45:05 -04:30
AD7six
2078dbccaa use the cake_console domain for everything related to the cli 
using big po files causes a lot of noise to be loaded whenver the
langauge domain is touched - therefore avoid any cli messages from being
loaded by web requests at all.
 2011-03-19 18:32:35 +01:00
AD7six
39c7d03319 Merge branch '2.0-class-loading' into 2.0-translations 
Conflicts:
	lib/Cake/Console/Command/Task/ControllerTask.php
	lib/Cake/Console/Command/Task/ProjectTask.php
	lib/Cake/Core/Configure.php
	lib/Cake/View/pages/home.ctp
 2011-03-16 12:29:39 +01:00
Jose Lorenzo Rodriguez
8ce605ab88 Fix for regression introduced in last commit 2011-03-16 00:28:08 -04:00
Jose Lorenzo Rodriguez
3f7928fccc Changing paths againg form datasources sub packages, 
Updating database.php.default file
Fixing view generation task
 2011-03-16 00:14:37 -04:00
Jose Lorenzo Rodriguez
8213160bb1 Udating template home.ctp and providing a default skel dir in tamplate task 2011-03-15 23:48:51 -04:00
Jose Lorenzo Rodriguez
9293361562 Updating ControllerTask to crete files with new naming conventions 2011-03-15 22:23:51 -04:00
Jose Lorenzo Rodriguez
b0a7a109e9 Updating ModelTask to crete files following the new namings 2011-03-15 22:14:10 -04:00
AD7six
8f0c923cf6 translations for the console dir 2011-03-12 19:59:06 +01:00
Jose Lorenzo Rodriguez
bab30bd48d More fixes after the recent changes in App::core() 2011-03-12 00:32:44 -04:30
Jose Lorenzo Rodriguez
fd8a7ed6d6 Fixing ControllerTask tests 2011-03-08 01:25:01 -04:30
Jose Lorenzo Rodriguez
0f993fa767 Fixing ModelTaks tests and starting to work on PluginTask tests 2011-03-08 00:50:07 -04:30
Jose Lorenzo Rodriguez
a56c4bff77 Fxing ProjectTask tests 2011-03-07 01:25:05 -04:30
Jose Lorenzo Rodriguez
2ef02ba29b Starting to move all console related classes, ViewTask tests passing 2011-03-07 00:45:00 -04:30
Jose Lorenzo Rodriguez
ba694c45c9 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading 2011-02-27 22:50:53 -04:30
José Lorenzo Rodríguez
6e4f4efb79 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/bootstrap.php
	lib/Cake/Console/Command/TestSuiteShell.php
	lib/Cake/Console/TaskCollection.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Controller/Controller.php
	lib/Cake/Core/App.php
	lib/Cake/Model/BehaviorCollection.php
	lib/Cake/Network/CakeRequest.php
	lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
	lib/Cake/TestSuite/CakeWebTestCase.php
	lib/Cake/TestSuite/TestManager.php
	lib/Cake/TestSuite/TestRunner.php
	lib/Cake/View/HelperCollection.php
	lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	lib/Cake/tests/cases/libs/test_manager.test.php
 2011-02-13 23:10:19 -04:30
José Lorenzo Rodríguez
d9c99b5ef6 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/tests/cases/libs/controller_test_case.test.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/View/pages/home.ctp
 2011-01-22 01:00:15 -04:30
José Lorenzo Rodríguez
1332561164 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/libs/view/helpers/js.php
	lib/Cake/Console/Command/Task/FixtureTask.php
 2011-01-09 23:32:05 -04:30
José Lorenzo Rodríguez
4c0e06c451 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/bootstrap.php
	cake/libs/view/helpers/js.php
	lib/Cake/Model/AclNode.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/bootstrap.php
	lib/Cake/tests/cases/libs/controller/controller.test.php
 2011-01-02 02:00:03 -04:30
José Lorenzo Rodríguez
07e43bb0f8 Merge remote branch 'origin/2.0' into 2.0-class-loading 
Conflicts:
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/form.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
	cake/tests/test_app/views/posts/scaffold.edit.ctp
	cake/tests/test_app/views/posts/scaffold.form.ctp
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/CakeSession.php
	lib/Cake/Routing/Router.php
	lib/Cake/TestSuite/TestManager.php
	lib/Cake/View/scaffolds/edit.ctp
	lib/Cake/tests/cases/console/shells/bake.test.php
	lib/Cake/tests/cases/libs/cake_log.test.php
	lib/Cake/tests/cases/libs/cake_request.test.php
	lib/Cake/tests/cases/libs/view/helpers/number.test.php
	lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
 2010-12-15 01:13:05 -04:30
José Lorenzo Rodríguez
b8344ecd33 Replacing some of the App::import by App::uses 2010-12-08 23:15:18 -04:30
José Lorenzo Rodríguez
848461f7a0 Making the testsuite run again 2010-12-08 01:49:36 -04:30
José Lorenzo Rodríguez
66145db2a9 Fixing class loading for bake tasks 2010-12-07 19:50:56 -04:30
José Lorenzo Rodríguez
b5122e6e81 Fixing more console classes 2010-12-07 01:44:47 -04:30
José Lorenzo Rodríguez
1c0a4c9e0a Starting to move console classes 2010-12-07 00:47:53 -04:30