euromark
52ecccb1a2
App::uses and usage replacements for String => CakeText.
2015-01-05 01:00:57 +01:00
euromark
63093e1d30
More String CakeText replacements and a BC class.
2015-01-05 00:55:23 +01:00
euromark
722e54279c
Rename String to CakeText.
2015-01-05 00:53:32 +01:00
mark_story
4d6611b328
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-12-17 21:38:32 -05:00
mark_story
ac6d5cc70f
Fix incorrect pluralization of Human.
...
Human should become humans, unlike other words ending in man.
Fixes #5370
2014-12-09 21:51:42 -05:00
euromark
e1c128bb99
Consolidate with conditions sniff.
2014-12-09 03:17:35 +01:00
euromark
41c646c5a1
Simplification of return types. No need to return more mixed than necessary.
2014-11-08 20:07:47 +01:00
euromark
345a18f15f
Merge branch 'master' into 2.6
2014-11-05 23:29:06 +01:00
euromark
768f2c809c
Correct doc block return types.
2014-11-05 13:03:27 +01:00
mark_story
579b16d90b
Merge branch 'master' into 2.6
2014-10-30 21:20:53 -04:00
mark_story
d228d83b1e
Relative paths should be created relative to pwd.
...
If create() is called with a relative directory and the path does not
exist, it should be created inside of the folder->pwd() and not inside
the process' cwd.
Refs #4990
2014-10-27 21:32:28 -04:00
mark_story
b5050db643
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6
2014-10-24 22:06:03 -04:00
mark_story
b98d2a3365
Merge branch 'master' into 2.6
2014-10-24 22:05:46 -04:00
Juan Basso
ba0901d40e
Removed the code that was never being executed
2014-10-19 18:56:02 -04:00
dmromanov
959a22a8b2
Documentation correction
2014-10-19 00:05:08 +04:00
ADmad
6dc98afa1e
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/VERSION.txt
2014-10-12 20:20:14 +05:30
Ceeram
43e998422e
Fix PHPCS errors
2014-10-10 16:52:01 +02:00
Mark Story
d99d9bc37f
Merge pull request #4780 from Schlaefer/timeAgoInWords-futureString
...
adds option for future string to CakeTime::timeAgoInWords & code cleanup
2014-10-01 20:34:41 -04:00
mark_story
2ee0827161
Fix PHPCS errors.
2014-10-01 20:34:33 -04:00
Hunter Perrin
be8c591dd8
Fixed coding standard violations.
2014-10-01 12:40:22 -07:00
Hunter Perrin
050e368bd0
Improvements to Hash::expand and Hash::merge.
...
Because of the recursion in these functions, processing very large
arrays would take a very long time. I rewrote the functions to
eliminate any unnecessary recursion and function calls. Large arrays
are now processed much faster.
2014-10-01 12:08:43 -07:00
Schlaefer
fd2dd58360
code formatting, fixes PHPCS errors
2014-10-01 11:25:24 +02:00
Schlaefer
388e412a82
fixes failing test cases from last CakeTime::timeAgoInWords changes
...
at b96eb1fb46
2014-10-01 11:09:00 +02:00
Schlaefer
b96eb1fb46
cleans up CakeTime::timeAgoInWords and adds option for custom futures string
2014-10-01 10:35:41 +02:00
mark_story
af43bc1706
Merge branch 'master' into 2.6
2014-09-25 22:39:51 -04:00
Yves
b70cb132fd
Fix Hash::remove() removing data even if the path is not matched
2014-09-23 22:00:49 +02:00
mark_story
249dc5650b
Merge branch 'relative-sprintf' into 2.6
...
Refs #4550
2014-09-22 20:56:33 -04:00
mstra001
244acc724d
Add strftime() support to CakeTime::timeAgoInWords()
...
When an absolute date is generated CakeTime will automatically use
strftime() if the format string contains %. This allows for simpler
localization.
Refs #4550
2014-09-22 20:49:20 -04:00
ADmad
3fb252ad2f
Merge branch 'master' into 2.6
2014-09-13 00:37:16 +05:30
Yves
90ad813b40
Fix Hash not returning correct value with special paths
...
When doing a Hash::insert() with a part of the path starting with a '0', Hash::get() returned null even if the same path was used.
2014-09-10 22:47:25 +02:00
euromark
a6df3300b9
Wording.
2014-09-10 17:57:26 +02:00
euromark
eedefb9dec
Clarify octal input instead.
2014-09-10 17:56:02 +02:00
euromark
3e25282d4c
Fix PHP flaw around intval with custom base.
2014-09-10 17:40:01 +02:00
euromark
04ef39217f
Take care of more int casts.
2014-09-10 16:29:23 +02:00
euromark
e77f96d8b7
Use (int) cast instead of intval() function for performance reasons and to unify it.
2014-09-10 15:52:57 +02:00
mark_story
86bc7f1861
Add tests for #4521 and reformat code.
...
Add a regression test for #4521 as the original author didn't have one.
Reformat a long line since I was nearby already.
Closes #4521
2014-09-09 21:33:17 -04:00
mark_story
734bb9223b
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/Core/App.php
lib/Cake/VERSION.txt
2014-09-06 23:04:20 -04:00
Angel S. Moreno
29570e1d99
Fixed overwriting of files when Folder::SKIP is set
2014-09-06 18:32:45 -04:00
Marc Würth
67ba9cb406
Update all @deprecated annotations
...
to adhere to the @deprecated <version> <description> format, where version and description are mandatory.
2014-09-02 17:03:22 +02:00
mark_story
7c316bbc56
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/basics.php
2014-08-30 21:28:11 -04:00
mark_story
c26b381469
Make words ending in data uninflected.
...
Since both metadata and word ending in metadata have caused issues in
the past, uninflecting them seems like the best option. This will also
cover cases like ProfileData not being inflected to ProfileDatum which
seems like an improvement to me.
Fixes #4419
2014-08-30 20:27:37 -04:00
mark_story
4a805af5c6
Merge branch 'master' into 2.6
2014-08-23 09:20:19 +02:00
mark_story
0400a63004
Forward port fixes for #4294 from 1.3 to 2.x
...
CakeTime was broken in the same way as TimeHelper was in 1.x. Getting
1969 on invalid input can be very confusing and un-helpful.
Refs #4294
2014-08-20 00:25:01 +02:00
mark_story
9c3089796f
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/Model/Model.php
2014-08-08 23:28:06 -04:00
euromark
816e64bec8
Adjust wording.
2014-08-04 16:46:56 +02:00
euromark
bbcdf2404e
Deprecate ssn() validation in favor of plugin Localized.
2014-08-04 16:39:43 +02:00
euromark
9ef7b5713a
CS fixes.
2014-08-04 13:53:52 +02:00
ADmad
713f430fc4
Merge branch 'master' into 2.6
2014-08-03 01:05:36 +05:30
Anthony GRASSIOT
aa42b80a4d
a / an typo fixes fot API
2014-07-30 22:11:03 +02:00
euromark
b188d670b7
Make year range validation less strict by default.
2014-07-26 04:06:26 +02:00
