mark_story
21ba5bf04a
Merge branch '2.1' into 2.2
2012-04-17 21:47:24 -04:00
Cauan Cabral
28bd6880df
Make Validation::decimal accept integers
...
Fix #2800
Force locale of ValidationTests with en_US to ensure decimal dot separator
2012-04-17 20:22:22 -04:00
mark_story
a4f0399f74
Fix coding standards warnings.
2012-04-10 22:16:14 -04: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
f8966a64f2
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
2012-04-09 21:55:02 -04:00
mark_story
3c9e79737d
Update doc blocks for CakeNumber.
2012-04-08 12:35:44 -04:00
mark_story
eeec362741
Merge remote-tracking branch 'ceeram/2.2-hash' into 2.2-hash
2012-04-07 14:28:40 -04:00
mark_story
83789915a3
Update docs about PHP5.4 constant.
2012-04-04 21:36:56 -04:00
Ceeram
7700a0261b
only use and test SORT_NATURAL on PHP 5.4
2012-04-04 18:21:52 +02:00
mark_story
e5ca80b711
Add additional sort flag support.
...
Add natural, numeric, and string sorting to Hash.
Fixes #1700
2012-04-01 23:09:15 -04:00
mark_story
475a1596b7
Merge branch '2.1' into 2.2
2012-04-01 15:37:21 -04:00
mark_story
6677127c8e
Fix coding standard error.
2012-03-31 21:38:39 -04:00
mark_story
432d00de19
Another small optimization.
2012-03-31 21:37:10 -04:00
mark_story
7d098fa5f0
Some small performance optimizations.
2012-03-31 21:25:02 -04:00
mark_story
6a9fdd841a
Fix failing tests.
...
Set::merge() accepts anything even non-array values.
2012-03-31 13:38:09 -04:00
Kyle Robinson Young
4370bf280a
Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4
...
Fixes #2602
2012-03-28 10:46:31 -07:00
Mark Story
0443fe1507
Merge pull request #584 from shama/patch-inpath-test
...
Add test/doc for reverse Folder::inPath()
2012-03-27 16:50:38 -07:00
Kyle Robinson Young
deb5a57cb9
Add test/doc for reverse Folder::inPath()
2012-03-27 11:55:13 -07:00
mark_story
95d4549c9b
Docs + coding standards.
2012-03-26 22:57:50 -04:00
mark_story
c087576f20
Port changes done to Set into Hash
...
See #2722
2012-03-26 22:39:13 -04:00
mark_story
6e0e15682f
Remove duplication where possible.
2012-03-26 22:33:46 -04:00
mark_story
66eabe462a
Copy Set::expand into Hash class.
2012-03-26 22:32:58 -04:00
mark_story
9015d78017
Port most recent changes in Set to Hash.
...
See [68eeee80d8
] and
[af575027da
]
2012-03-26 22:32:56 -04:00
mark_story
e55927c007
Update the doc links.
2012-03-26 22:32:56 -04:00
mark_story
0ef9adba93
Move and rename pushDiff onto Hash.
...
Its used internally in a number of places and diff() + merge()
are not an resonable replacement.
2012-03-26 22:32:54 -04:00
mark_story
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
mark_story
2231087ba3
Rename Set2 -> Hash.
2012-03-26 22:25:40 -04:00
mark_story
5b4b936157
Make filter() more flexible.
2012-03-26 22:25:40 -04:00
mark_story
239f52c48c
Move nest() over
...
Make get() able to take arrays for $path.
2012-03-26 22:25:40 -04:00
mark_story
ae66682c35
Add apply(), map() and reduce()
...
Add tests as well.
2012-03-26 22:25:39 -04:00
mark_story
8cadac3ee5
Add tests for issue #104
2012-03-26 22:25:39 -04:00
mark_story
ff5e72c9a7
Move Set::format across.
...
Remove the {0} style of formatting. Custom formatting
syntax is a bit silly. sprintf() is more than expressive enough
for this method.
2012-03-26 22:25:39 -04:00
mark_story
e4a505797d
Move combine() across.
2012-03-26 22:25:39 -04:00
mark_story
aa4dca6c0c
Move Set::check across.
2012-03-26 22:25:39 -04:00
mark_story
771efd950e
Fix sort() not working.
2012-03-26 22:25:38 -04:00
mark_story
57d50cd018
Extract common method.
2012-03-26 22:25:38 -04:00
mark_story
3d8a955043
Add remove() and insert()
...
Also add support for multi insert and multi remove.
2012-03-26 22:25:38 -04:00
mark_story
6b69ed269a
Extracting duplicate loops.
2012-03-26 22:25:38 -04:00
mark_story
e72127e359
WIP, adding sort() and remove()
2012-03-26 22:25:37 -04:00
mark_story
31181f58d6
Add attribute pattern matching.
2012-03-26 22:25:37 -04:00
mark_story
cbfa938303
Fix muliple attribute conditions.
2012-03-26 22:25:37 -04:00
mark_story
8ad4e66eba
Making attributes work with any selector type.
...
Attributes work with all base selectors.
2012-03-26 22:25:37 -04:00
mark_story
9269a6dcde
Added some more operators.
...
Attribute + {n} is still not working.
2012-03-26 22:25:36 -04:00
mark_story
6c87be97ef
Implement presence and equality attributes.
2012-03-26 22:25:36 -04:00
mark_story
37181e99a8
Basic path selectors implemented for extract().
2012-03-26 22:25:36 -04:00
mark_story
b3861c01dc
Move numeric() into Set2.
2012-03-26 22:25:36 -04:00
mark_story
1315e0f1a1
Moving filter() into Set2.
2012-03-26 22:25:35 -04:00
mark_story
885d5dfd80
Make contains() non-recursive.
...
Add a few more tests for contains().
2012-03-26 22:25:35 -04:00
mark_story
d37e10a8a9
Move contains() across.
...
Fix a few issues in contains() with nested needle values.
2012-03-26 22:25:35 -04:00
mark_story
ad65098348
Move normalize() into Set2.
...
Dropping the ability to 'normalize' string data.
2012-03-26 22:25:34 -04:00
mark_story
e736ea3af9
Move merge() into Set2.
2012-03-26 22:25:34 -04:00
mark_story
51f45c0f28
Moving flatten() across.
...
It is no longer recursive either.
2012-03-26 22:25:34 -04:00
mark_story
51e3ee0425
Adding dimensions() and maxDimensions()
...
Splitting the Set::countDim() into two methods. This creates a simpler
API, as each method only does one job, and only has one argument. Also
replacing recursion with iteration.
2012-03-26 22:25:34 -04:00
mark_story
db3485d47c
Add function prototypes.
2012-03-26 22:25:34 -04:00
mark_story
328513d35e
Start Set2.
2012-03-26 22:25:33 -04:00
mark_story
6b045318d8
Merge branch '2.1' into 2.2
2012-03-26 22:24:30 -04:00
mark_story
b3d886fe82
Fix Set::insert() not overwriting values.
...
Set::insert() failed to overwrite values that were previously
defined as strings. Remove test in SessionComponentTest that was
ensuring this bug stuck around.
Fixes #2722
2012-03-26 21:50:53 -04:00
Jose Lorenzo Rodriguez
b373309ba9
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-03-25 21:18:58 -04:30
mark_story
49a455a2cb
Fix some code standards warnings.
2012-03-24 22:15:08 -04:00
dogmatic69
d3a44811ce
adding test and fix for hightlighting tags, old bug 2111 for 1.3 but its the same issue. This should make more options possible
2012-03-16 21:20:27 +00:00
Rachman Chavik
079ae8265c
Set::expand as implemented by jeremyharris
2012-03-15 20:07:49 +07:00
Rachman Chavik
af575027da
fix Set::sort() for issue in previous commit
2012-03-13 12:45:06 +07:00
Juan Basso
3b1bd90ad6
Updated copyright to 2012.
2012-03-12 22:46:07 -04:00
Ceeram
68eeee80d8
Set::sort() now correctly sorts when using {s}.path, fixes #2673
2012-03-12 21:58:24 +01:00
mark_story
a9c8a520b2
Port [c19b233] to 2.1
2012-03-12 12:33:20 -04:00
Majna
4543a4cb88
Make Validation class more strict when checking values in list.
...
Use in_array() with 'strict' param. Affected rules are Validation::inList() and Validation::multiple().
2012-03-07 18:52:48 +01:00
mark_story
664b0538b8
Fix more coding standards problems.
2012-03-04 22:49:38 -05:00
mark_story
9d325fe46e
Fixing most coding standard issues in Utility/
2012-03-03 17:31:47 -05:00
mark_story
7d51db9e63
Merge branch '2.0' into 2.1
2012-03-03 12:27:22 -05:00
mark_story
0b4f735b4c
Update API docs for Set::extract()
...
Fixes #2634
2012-03-02 11:19:17 -05:00
Michael Hagedon
5eb4155236
Fixing case.
2012-02-28 13:20:47 -07:00
Michael Hagedon
ef80045fc5
Fixing _fromArray(). See http://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/2624-xml_fromarray-does-not-handle-certain-array-structures-as-expected
2012-02-28 12:41:43 -07:00
euromark
e94d307ee1
code conventions
2012-02-25 19:46:05 -05:00
mark_story
943d928084
Merge branch '2.0' into 2.1
2012-02-18 22:19:38 -05:00
mark_story
2ddc3873c2
Update the Set::merge() documentation.
2012-02-18 16:01:07 -05:00
Mark Story
60df31cfb6
Merge pull request #487 from dogmatic69/2.1
...
2.1
2012-02-17 17:38:03 -08:00
Majna
0cd9a93e9e
Remove unused variables and statements.
2012-02-17 21:10:43 +01:00
Majna
c40d132f81
Fix Folder::tree() when excluding dot files or folders.
...
When 'exclude' param is array('.') files/folders are not skipped. Added test.
2012-02-17 20:46:52 +01:00
dogmatic69
be49b2b942
fixing up the docs for Collection::attached(), was showing behaviors but is for all collections
2012-02-17 13:25:37 +00:00
mark_story
6412797dfc
Add missing static.
2012-02-16 20:58:43 -05:00
Rachman Chavik
d6fd051fb4
changing methods in CakeTime class to static
2012-02-14 09:34:36 +07:00
Rachman Chavik
9624c27ef4
changing methods in CakeNumber class to static
2012-02-14 09:34:36 +07:00
Rachman Chavik
abd6d22445
changing methods in String class to static
2012-02-14 09:34:36 +07: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
Jose Lorenzo Rodriguez
fd17e33e78
Making CakeNumber::addFormat static so it is easier to configure globally for the app
2012-02-10 22:25:59 +07:00
Rachman Chavik
2dc9986fad
moving methods from TextHelper to String
2012-02-10 22:25:59 +07:00
Rachman Chavik
6fdaef10c8
moving NumberHelper to CakeNumber
2012-02-10 22:25:59 +07:00
Rachman Chavik
04cdef9126
moving TimeHelper to CakeTime
2012-02-10 22:25:59 +07:00
Thomas Ploch
94e5ec0545
Added handling of E_USER_DEPRECATED to ErrorHandler and Debugger.
2012-02-05 12:10:07 +01:00
mark_story
29514b08fb
Fix re-numbering of values in exportVar()
...
Using array_merge resulted in values being re-indexed,
change how arrays are combined to preserve keys.
Fixes #2506
2012-01-24 20:52:43 -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
mattpotts
1c645152ca
added sftp to url()
2012-01-19 22:05:10 -05:00
ADmad
d61b6dc7d3
Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487
2012-01-20 04:05:40 +05:30
ADmad
2c239cc851
Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487
2012-01-20 03:31:08 +05:30
AD7six
f1f1ce0db4
allow specifying an explicit root
2012-01-18 13:05:44 +01:00
AD7six
7414d0f77b
rename set::getValue to set::get - and make it public
2012-01-12 09:45:28 +01:00
AD7six
3b1dd82603
add tests for set nest method
2012-01-10 10:18:59 +01:00
AD7six
d534013570
reduce code repetition
2012-01-10 09:47:51 +01:00
AD7six
5608d63541
allow set nest to work with any-d arrays
...
not just model-formatted arrays
2012-01-10 01:24:20 +01:00
AD7six
442d889f99
move the paths used into options
2012-01-10 00:48:36 +01:00
AD7six
7b640b8123
move find threaded logic to the set class
2012-01-10 00:24:38 +01:00
AD7six
b8598c5ca0
Ensure the class has a constructor
...
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.
Conflicts:
lib/Cake/Utility/ClassRegistry.php
2012-01-09 23:42:09 +01:00
AD7six
336c750b7e
Ensure the class has a constructor
...
if there is no constructor (this means a model which does not inherit
from Model) newInstance will throw an exception.
2012-01-09 23:38:32 +01:00
Jose Lorenzo Rodriguez
8b7f069415
Wrapping highlight_string into a helper function as hphp does not implemnet this function
2012-01-07 19:10:44 -04:30
Jose Lorenzo Rodriguez
44dd25010d
Adding a replacement for zend_thread_id() to use within hiphop
2012-01-07 18:41:16 -04:30
mark_story
de7921a5d4
Merge branch '2.0' into 2.1
2012-01-06 23:06:37 -05:00
mark_story
9a7e69df7f
Add missing else for non SQLServer db's.
2012-01-06 23:06:12 -05:00
mark_story
15c7493e39
Merge branch '2.0' into 2.1
2012-01-06 23:02:16 -05:00
mark_story
d69c3f3db6
Fix failing tests with SQLServer.
2012-01-06 22:53:39 -05:00
mark_story
e649a0516e
Fix singularization of 'foes'
...
Fixes #2424
2012-01-05 21:22:40 -05:00
mark_story
3478f8a627
Merge branch '2.0' into 2.1
2011-12-30 10:19:51 -05:00
mark_story
ed43c685b9
Fix string offset error in PHP 5.4
2011-12-29 22:10:12 -05:00
mark_story
23178df504
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Config/config.php
lib/Cake/VERSION.txt
lib/Cake/View/Helper/FormHelper.php
2011-12-29 20:03:42 -05:00
mark_story
5936fa5930
Fix strict errors.
2011-12-29 11:10:25 -05:00
Mark Story
e9813d7a97
Fix errors with illegal string offsets.
...
If $_list becomes a string notice errors are triggered when trying
to do offsets in PHP 5.4
2011-12-27 21:38:14 -05:00
Jose Lorenzo Rodriguez
1651257919
Migrating all model callbacks to the CakeEventManager, fixing some minor bugs. All tests passing again
2011-12-26 13:06:48 -04:30
Jose Lorenzo Rodriguez
35ecbfebde
Making the CakeEvent -> ObjectCollection bridge more intelligent, adding tests
2011-12-25 23:17:08 -04:30
Jose Lorenzo Rodriguez
7fdc1cc8d4
Migrating the beforeRedirect callback to the CakeEventManager, reorganizing how events are triggered in controller
2011-12-25 22:48:27 -04:30
Jose Lorenzo Rodriguez
078a2dfd72
Migrating View and Helpers events to use the CakeEvenManager
2011-12-25 19:00:19 -04:30
Jose Lorenzo Rodriguez
5d67195bf7
Migrating Controller events to use the CakeEventManager
2011-12-25 14:44:34 -04:30
ADmad
bcab3d0cb9
Made default value and behavior of param $exceptions
for Folder::tree() identical to same param in Folder::read()
2011-12-22 03:29:21 +05:30
ADmad
b84c9a1aaa
Removing unused function Folder::_tree(). Added exception handling in Folder::delete().
2011-12-22 03:22:46 +05:30
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
ADmad
7339640ef2
Fixed files inside dot folder showing up even when hiding dot files/folder in Folder::tree(). Closes #2395
2011-12-22 02:55:24 +05:30
mark_story
2d68e7da1e
Fix failing tests.
...
You can't use finfo on files that don't exist.
2011-12-18 23:26:57 -05:00
mark_story
f959fcefc4
Add File::mime()
...
Fixes #1051
2011-12-18 23:02:05 -05:00
mark_story
39b1203e9a
Making modParams work with non-array values.
...
All but true, false, null will replace the parameter now.
This allows modification of string and object parameters.
2011-12-17 22:23:36 -05:00
Kyle Robinson Young
d794084d38
More code standards formatting
2011-12-15 23:00:07 -08:00
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
ADmad
16d29a8d0e
Making Folder::delete() code more PHP5ish
2011-12-15 03:07:17 +05:30
mark_story
07a2a60468
Merge branch '2.0' into 2.1
2011-12-13 22:03:40 -05:00
mark_story
645ef47878
Fix multiple date formats in Validation::date()
...
Fixes #2364
2011-12-12 20:21:10 -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
bc8ae11fc1
Fix fatal error with abstract/interface classes
...
Abstract/Interface classes + ClassRegistry::init() should
raise an exception, not cause fatal errors.
Update CakeSchema to swallow and ignore any exceptions coming from
ClassRegistry.
Fixes #2328
2011-12-07 20:58:01 -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
8197f87dbc
Spelling and grammar fixes
2011-12-01 21:58:09 -08:00
Kyle Robinson Young
94e119fe67
Adhere to code formatting standard
2011-11-30 23:21:31 -08:00
mark_story
c1f5dc1e40
Make XmlView consistent with JsonView.
...
Both allow a view script or a serialize key with the name
of the variable to be serialized.
2011-11-27 23:51:48 -05:00
Christian Hieke
a51626840e
Escape special characters in XML.
...
Fixes #2188 .
2011-11-25 21:20:26 -05:00
mark_story
21cd3f00ac
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/BasicsTest.php
2011-11-19 20:40:07 -05:00
Kyle Robinson Young
708ae873a5
Add @link to Set methods
2011-11-18 11:13:46 -08:00
Kyle Robinson Young
53f7a716ec
Add @link to File/Folder properties
2011-11-18 11:05:30 -08:00
ADmad
90b007ef75
Implemented priority based triggering of callbacks for objects in collection
2011-11-17 12:36:54 +05:30
Rachman Chavik
aab8e98531
Configure ClassRegistry in test mode
...
CR::config accepts 'testing' key to indicate a test run.
When this flag is set, CR::init() will use 'test' datasource,
or append 'test_' prefix to a model's useDbConfig value if
the datasource configured.
2011-11-17 11:31:36 +07:00
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
Kyle Robinson Young
3248e34819
Add @link to File and Folder utilities
2011-11-14 22:40:02 -08:00
mark_story
2c7854cc2f
Replace complicated $$foo with simple variable.
2011-11-12 21:42:20 -05:00
ADmad
e1354b2ee6
Merge branch '2.0' into 2.1
2011-11-06 20:39:08 +05:30