mark_story
2032fef772
Merge branch '2.x' into 2.next
2017-06-26 21:51:41 -04:00
Marc Würth
da8414e13b
Use HTTPS for the opensource.org MIT license URL
2017-06-11 00:23:22 +02:00
Marc Würth
10b89b51a9
Use HTTPS for the cakefoundation.org URL
2017-06-11 00:10:59 +02:00
Marc Würth
17314baa15
Use HTTPS for the cakephp.org URL
2017-06-10 23:40:28 +02:00
Joe
70ead28a1d
Redo commits on 2.next branch
2017-05-12 02:02:36 -04:00
Mark Scherer
52e79987a2
Replacing self with static due to PHP5.3+. Following #7040 .
2015-07-21 10:22:53 +02:00
euromark
768f2c809c
Correct doc block return types.
2014-11-05 13:03:27 +01:00
euromark
974ca851c2
Correct doc blocks according to cs guidelines.
...
Remove superfluous empty lines.
2014-07-03 15:36:42 +02:00
Marc Würth
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
...
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
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
mark_story
62660c6706
Re-assign $db after beforeSave.
...
This allows model/behavior methods to change the datasource in the
beforeSave callback. If you use drivers from different SQL platforms
things will go very poorly.
Fixes #3606
2013-04-21 21:15:44 -04:00
Ceeram
8374eb92cc
fix failing tests. test and mocked sources would cause exceptions
2013-03-13 22:31:23 +01:00
Ceeram
dde0912d1e
Throw exceptions only when datasource has wrong package, not check for instance of Datasource
2013-03-13 17:56:51 +01:00
mark_story
3d4ebc038c
Throw exceptions when non Datasource classes are used as Datasources.
...
Using models as datasources can cause segmentation faults. Guard against
that by checking types and raising exceptions early.
Fixes #3694
2013-03-12 21:59:45 -04: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
euromark
3945c0e6a8
rtim files
2012-07-18 03:55:29 +02:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
mark_story
9a6ad7e1e2
Fixing most coding standard issues in Model/
2012-03-04 21:51:50 -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
Renan Gonçalves
573a349209
Using plugin name on exception thrown and in templates files.
2011-10-16 13:40:36 +02:00
Renan Gonçalves
1cf67b1e55
Little cleanup in exceptions.
...
- Removed duplicated or non-used exceptions.
- Making the error messages more descriptive and stardard.
2011-10-15 20:08:02 +02:00
Jose Lorenzo Rodriguez
a14abd6281
Fixing DatabaseSession handler to correctly close the session before the model object is destroyed by php.
...
This allows to remove an old hack in ConnectionManager
2011-10-06 23:01:49 -04:30
Juan Basso
f5a54d00dd
Changed methods and attributes from private to protected.
2011-08-20 00:43:34 -04:00
Juan Basso
895c10af7b
Adjusted some types in @param, @return and @var.
2011-07-31 22:57:17 -04:00
Juan Basso
9bc3e567c1
Removed the @access and @static.
2011-07-30 20:56:48 -04:00
Juan Basso
39b4032820
Fixed some API doc in model.
2011-07-30 18:38:57 -04:00
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
Juan Basso
1c7d54eacc
Updated the paths from comments.
2011-06-19 20:28:40 -04:00
Jose Lorenzo Rodriguez
2a39e6869c
Merge branch '2.0' into 2.0-merge
...
Conflicts:
lib/Cake/Test/Case/Controller/ScaffoldTest.php
lib/Cake/Test/Case/Model/ConnectionManagerTest.php
lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
lib/Cake/Test/Case/Utility/SanitizeTest.php
2011-06-17 18:04:03 -04:30
Juan Basso
192812ee7f
Updating the copyright to 2011.
2011-05-30 22:32:43 -04:00
Jose Lorenzo Rodriguez
e669a81e0a
Reverting change in ConnectionManager, sourceList() will only return the instantiated datasources
...
Fixing remaining tests failing due to contamination of loaded plugin is app
2011-05-27 02:28:38 -04:30
Jose Lorenzo Rodriguez
b320e4323f
Improving ConnectionManager tests
2011-05-27 02:13:35 -04:30
Jose Lorenzo Rodriguez
01f6744e35
Removing unneeded line in ConnectionManager
2011-05-27 01:31:50 -04:30
AD7six
0cb70ae3bb
remove CONFIGS constant
2011-05-15 18:34:52 +02:00
Jose Lorenzo Rodriguez
f14a295a3e
Adding a ConenctionManager::drop() method useful for testing and other dynamic tasks
2011-04-16 22:57:05 -04:30
José Lorenzo Rodríguez
2386a11151
fixing tests from last merge
2011-01-22 01:11:22 -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
54ecd2e77b
Some changes to ConnectionManager, it is now an static class. the connection objects enumeration will return the stored connections config instead of a cryptic array where only the ekys where useful
2011-01-05 22:15:17 -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
633f1dc1e5
Fixing warning in ConnectionManager
2010-12-18 22:27:02 -04:30
José Lorenzo Rodríguez
848461f7a0
Making the testsuite run again
2010-12-08 01:49:36 -04:30
José Lorenzo Rodríguez
7828f7d2fb
Lazy loading connections in ConnectionManager, changing some class names and imports
2010-12-07 19:59:07 -04:30
José Lorenzo Rodríguez
66744c68b0
Making ConnectionManager an static object instead of a singleton
2010-12-06 22:47:43 -04:30
José Lorenzo Rodríguez
3f64844de9
Merge remote branch 'origin/2.0' into 2.0-class-loading
...
Conflicts:
lib/Cake/Model/ConnectionManager.php
lib/Cake/basics.php
2010-12-05 23:43:58 -04:30
José Lorenzo Rodríguez
7dc8d5e746
Simplifying datasources loading, it now requires datasources to be configured with the 'datasource' array key, which is a relative path from Model/Datasource/
2010-12-04 12:24:15 -04:30
José Lorenzo Rodríguez
be1263d476
Moving the first database driver to the correct folder to start testing
2010-12-04 11:52:23 -04:30
José Lorenzo Rodríguez
592abb569c
More work towards loading datasources
2010-12-04 11:16:42 -04:30
José Lorenzo Rodríguez
4bb6d583b7
More work towards model loading
2010-12-04 03:00:03 -04:30